Changeset 699


Ignore:
Timestamp:
09/22/15 10:09:53 (9 years ago)
Author:
rlacroix
Message:

Add the Fortran interface for the new "time_counter" file attribute.

It had been forgotten in r692.

Location:
XIOS/trunk/src/interface
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • XIOS/trunk/src/interface/c_attr/icfile_attr.cpp

    r608 r699  
    429429 
    430430 
     431  void cxios_set_file_time_counter(file_Ptr file_hdl, const char * time_counter, int time_counter_size) 
     432  { 
     433    std::string time_counter_str; 
     434    if (!cstr2string(time_counter, time_counter_size, time_counter_str)) return; 
     435    CTimer::get("XIOS").resume(); 
     436    file_hdl->time_counter.fromString(time_counter_str); 
     437    CTimer::get("XIOS").suspend(); 
     438  } 
     439 
     440  void cxios_get_file_time_counter(file_Ptr file_hdl, char * time_counter, int time_counter_size) 
     441  { 
     442    CTimer::get("XIOS").resume(); 
     443    if (!string_copy(file_hdl->time_counter.getInheritedStringValue(), time_counter, time_counter_size)) 
     444      ERROR("void cxios_get_file_time_counter(file_Ptr file_hdl, char * time_counter, int time_counter_size)", << "Input string is too short"); 
     445    CTimer::get("XIOS").suspend(); 
     446  } 
     447 
     448  bool cxios_is_defined_file_time_counter(file_Ptr file_hdl) 
     449  { 
     450     CTimer::get("XIOS").resume(); 
     451     bool isDefined = file_hdl->time_counter.hasInheritedValue(); 
     452     CTimer::get("XIOS").suspend(); 
     453     return isDefined; 
     454  } 
     455 
     456 
    431457  void cxios_set_file_type(file_Ptr file_hdl, const char * type, int type_size) 
    432458  { 

  • XIOS/trunk/src/interface/c_attr/icfilegroup_attr.cpp

    r608 r699  
    455455 
    456456 
     457  void cxios_set_filegroup_time_counter(filegroup_Ptr filegroup_hdl, const char * time_counter, int time_counter_size) 
     458  { 
     459    std::string time_counter_str; 
     460    if (!cstr2string(time_counter, time_counter_size, time_counter_str)) return; 
     461    CTimer::get("XIOS").resume(); 
     462    filegroup_hdl->time_counter.fromString(time_counter_str); 
     463    CTimer::get("XIOS").suspend(); 
     464  } 
     465 
     466  void cxios_get_filegroup_time_counter(filegroup_Ptr filegroup_hdl, char * time_counter, int time_counter_size) 
     467  { 
     468    CTimer::get("XIOS").resume(); 
     469    if (!string_copy(filegroup_hdl->time_counter.getInheritedStringValue(), time_counter, time_counter_size)) 
     470      ERROR("void cxios_get_filegroup_time_counter(filegroup_Ptr filegroup_hdl, char * time_counter, int time_counter_size)", << "Input string is too short"); 
     471    CTimer::get("XIOS").suspend(); 
     472  } 
     473 
     474  bool cxios_is_defined_filegroup_time_counter(filegroup_Ptr filegroup_hdl) 
     475  { 
     476     CTimer::get("XIOS").resume(); 
     477     bool isDefined = filegroup_hdl->time_counter.hasInheritedValue(); 
     478     CTimer::get("XIOS").suspend(); 
     479     return isDefined; 
     480  } 
     481 
     482 
    457483  void cxios_set_filegroup_type(filegroup_Ptr filegroup_hdl, const char * type, int type_size) 
    458484  { 

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

    r608 r699  
    315315 
    316316 
     317    SUBROUTINE cxios_set_file_time_counter(file_hdl, time_counter, time_counter_size) BIND(C) 
     318      USE ISO_C_BINDING 
     319      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     320      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: time_counter 
     321      INTEGER  (kind = C_INT)     , VALUE        :: time_counter_size 
     322    END SUBROUTINE cxios_set_file_time_counter 
     323 
     324    SUBROUTINE cxios_get_file_time_counter(file_hdl, time_counter, time_counter_size) BIND(C) 
     325      USE ISO_C_BINDING 
     326      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     327      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: time_counter 
     328      INTEGER  (kind = C_INT)     , VALUE        :: time_counter_size 
     329    END SUBROUTINE cxios_get_file_time_counter 
     330 
     331    FUNCTION cxios_is_defined_file_time_counter(file_hdl) BIND(C) 
     332      USE ISO_C_BINDING 
     333      LOGICAL(kind=C_BOOL) :: cxios_is_defined_file_time_counter 
     334      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     335    END FUNCTION cxios_is_defined_file_time_counter 
     336 
     337 
    317338    SUBROUTINE cxios_set_file_type(file_hdl, type, type_size) BIND(C) 
    318339      USE ISO_C_BINDING 

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

    r608 r699  
    336336 
    337337 
     338    SUBROUTINE cxios_set_filegroup_time_counter(filegroup_hdl, time_counter, time_counter_size) BIND(C) 
     339      USE ISO_C_BINDING 
     340      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     341      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: time_counter 
     342      INTEGER  (kind = C_INT)     , VALUE        :: time_counter_size 
     343    END SUBROUTINE cxios_set_filegroup_time_counter 
     344 
     345    SUBROUTINE cxios_get_filegroup_time_counter(filegroup_hdl, time_counter, time_counter_size) BIND(C) 
     346      USE ISO_C_BINDING 
     347      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     348      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: time_counter 
     349      INTEGER  (kind = C_INT)     , VALUE        :: time_counter_size 
     350    END SUBROUTINE cxios_get_filegroup_time_counter 
     351 
     352    FUNCTION cxios_is_defined_filegroup_time_counter(filegroup_hdl) BIND(C) 
     353      USE ISO_C_BINDING 
     354      LOGICAL(kind=C_BOOL) :: cxios_is_defined_filegroup_time_counter 
     355      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     356    END FUNCTION cxios_is_defined_filegroup_time_counter 
     357 
     358 
    338359    SUBROUTINE cxios_set_filegroup_type(filegroup_hdl, type, type_size) BIND(C) 
    339360      USE ISO_C_BINDING 

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

    r608 r699  
    1313  SUBROUTINE xios(set_file_attr)  & 
    1414    ( 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 ) 
     15    , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter  & 
     16    , type ) 
    1617 
    1718    IMPLICIT NONE 
    … …  
    3536      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: split_freq_format 
    3637      TYPE(txios(duration))  , OPTIONAL, INTENT(IN) :: sync_freq 
     38      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter 
    3739      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type 
    3840 
    … …  
    4143      ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
    4244      , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
    43       , type ) 
     45      , time_counter, type ) 
    4446 
    4547  END SUBROUTINE xios(set_file_attr) 
    … …  
    4850    ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
    4951    , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
    50     , type ) 
     52    , time_counter, type ) 
    5153 
    5254    IMPLICIT NONE 
    … …  
    6971      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: split_freq_format 
    7072      TYPE(txios(duration))  , OPTIONAL, INTENT(IN) :: sync_freq 
     73      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter 
    7174      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type 
    7275 
    … …  
    7477      ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
    7578      , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
    76       , type ) 
     79      , time_counter, type ) 
    7780 
    7881  END SUBROUTINE xios(set_file_attr_hdl) 
    … …  
    8184    ( file_hdl, append_, compression_level_, description_, enabled_, format_, min_digits_, mode_  & 
    8285    , name_, name_suffix_, output_freq_, output_level_, par_access_, split_freq_, split_freq_format_  & 
    83     , sync_freq_, type_ ) 
     86    , sync_freq_, time_counter_, type_ ) 
    8487 
    8588    IMPLICIT NONE 
    … …  
    102105      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: split_freq_format_ 
    103106      TYPE(txios(duration))  , OPTIONAL, INTENT(IN) :: sync_freq_ 
     107      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter_ 
    104108      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type_ 
    105109 
    … …  
    166170      ENDIF 
    167171 
     172      IF (PRESENT(time_counter_)) THEN 
     173        CALL cxios_set_file_time_counter(file_hdl%daddr, time_counter_, len(time_counter_)) 
     174      ENDIF 
     175 
    168176      IF (PRESENT(type_)) THEN 
    169177        CALL cxios_set_file_type(file_hdl%daddr, type_, len(type_)) 
    … …  
    174182  SUBROUTINE xios(get_file_attr)  & 
    175183    ( 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 ) 
     184    , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter  & 
     185    , type ) 
    177186 
    178187    IMPLICIT NONE 
    … …  
    196205      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: split_freq_format 
    197206      TYPE(txios(duration))  , OPTIONAL, INTENT(OUT) :: sync_freq 
     207      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter 
    198208      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type 
    199209 
    … …  
    202212      ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
    203213      , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
    204       , type ) 
     214      , time_counter, type ) 
    205215 
    206216  END SUBROUTINE xios(get_file_attr) 
    … …  
    209219    ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
    210220    , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
    211     , type ) 
     221    , time_counter, type ) 
    212222 
    213223    IMPLICIT NONE 
    … …  
    230240      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: split_freq_format 
    231241      TYPE(txios(duration))  , OPTIONAL, INTENT(OUT) :: sync_freq 
     242      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter 
    232243      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type 
    233244 
    … …  
    235246      ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
    236247      , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
    237       , type ) 
     248      , time_counter, type ) 
    238249 
    239250  END SUBROUTINE xios(get_file_attr_hdl) 
    … …  
    242253    ( file_hdl, append_, compression_level_, description_, enabled_, format_, min_digits_, mode_  & 
    243254    , name_, name_suffix_, output_freq_, output_level_, par_access_, split_freq_, split_freq_format_  & 
    244     , sync_freq_, type_ ) 
     255    , sync_freq_, time_counter_, type_ ) 
    245256 
    246257    IMPLICIT NONE 
    … …  
    263274      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: split_freq_format_ 
    264275      TYPE(txios(duration))  , OPTIONAL, INTENT(OUT) :: sync_freq_ 
     276      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter_ 
    265277      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type_ 
    266278 
    … …  
    327339      ENDIF 
    328340 
     341      IF (PRESENT(time_counter_)) THEN 
     342        CALL cxios_get_file_time_counter(file_hdl%daddr, time_counter_, len(time_counter_)) 
     343      ENDIF 
     344 
    329345      IF (PRESENT(type_)) THEN 
    330346        CALL cxios_get_file_type(file_hdl%daddr, type_, len(type_)) 
    … …  
    335351  SUBROUTINE xios(is_defined_file_attr)  & 
    336352    ( 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 ) 
     353    , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter  & 
     354    , type ) 
    338355 
    339356    IMPLICIT NONE 
    … …  
    370387      LOGICAL, OPTIONAL, INTENT(OUT) :: sync_freq 
    371388      LOGICAL(KIND=C_BOOL) :: sync_freq_tmp 
     389      LOGICAL, OPTIONAL, INTENT(OUT) :: time_counter 
     390      LOGICAL(KIND=C_BOOL) :: time_counter_tmp 
    372391      LOGICAL, OPTIONAL, INTENT(OUT) :: type 
    373392      LOGICAL(KIND=C_BOOL) :: type_tmp 
    … …  
    377396      ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
    378397      , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
    379       , type ) 
     398      , time_counter, type ) 
    380399 
    381400  END SUBROUTINE xios(is_defined_file_attr) 
    … …  
    384403    ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
    385404    , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
    386     , type ) 
     405    , time_counter, type ) 
    387406 
    388407    IMPLICIT NONE 
    … …  
    418437      LOGICAL, OPTIONAL, INTENT(OUT) :: sync_freq 
    419438      LOGICAL(KIND=C_BOOL) :: sync_freq_tmp 
     439      LOGICAL, OPTIONAL, INTENT(OUT) :: time_counter 
     440      LOGICAL(KIND=C_BOOL) :: time_counter_tmp 
    420441      LOGICAL, OPTIONAL, INTENT(OUT) :: type 
    421442      LOGICAL(KIND=C_BOOL) :: type_tmp 
    … …  
    424445      ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
    425446      , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
    426       , type ) 
     447      , time_counter, type ) 
    427448 
    428449  END SUBROUTINE xios(is_defined_file_attr_hdl) 
    … …  
    431452    ( file_hdl, append_, compression_level_, description_, enabled_, format_, min_digits_, mode_  & 
    432453    , name_, name_suffix_, output_freq_, output_level_, par_access_, split_freq_, split_freq_format_  & 
    433     , sync_freq_, type_ ) 
     454    , sync_freq_, time_counter_, type_ ) 
    434455 
    435456    IMPLICIT NONE 
    … …  
    465486      LOGICAL, OPTIONAL, INTENT(OUT) :: sync_freq_ 
    466487      LOGICAL(KIND=C_BOOL) :: sync_freq__tmp 
     488      LOGICAL, OPTIONAL, INTENT(OUT) :: time_counter_ 
     489      LOGICAL(KIND=C_BOOL) :: time_counter__tmp 
    467490      LOGICAL, OPTIONAL, INTENT(OUT) :: type_ 
    468491      LOGICAL(KIND=C_BOOL) :: type__tmp 
    … …  
    543566      ENDIF 
    544567 
     568      IF (PRESENT(time_counter_)) THEN 
     569        time_counter__tmp = cxios_is_defined_file_time_counter(file_hdl%daddr) 
     570        time_counter_ = time_counter__tmp 
     571      ENDIF 
     572 
    545573      IF (PRESENT(type_)) THEN 
    546574        type__tmp = cxios_is_defined_file_type(file_hdl%daddr) 

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

    r608 r699  
    1414    ( filegroup_id, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    1515    , mode, name, name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format  & 
    16     , sync_freq, type ) 
     16    , sync_freq, time_counter, type ) 
    1717 
    1818    IMPLICIT NONE 
    … …  
    3737      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: split_freq_format 
    3838      TYPE(txios(duration))  , OPTIONAL, INTENT(IN) :: sync_freq 
     39      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter 
    3940      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type 
    4041 
    … …  
    4344      ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    4445      , mode, name, name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format  & 
    45       , sync_freq, type ) 
     46      , sync_freq, time_counter, type ) 
    4647 
    4748  END SUBROUTINE xios(set_filegroup_attr) 
    … …  
    5051    ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    5152    , mode, name, name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format  & 
    52     , sync_freq, type ) 
     53    , sync_freq, time_counter, type ) 
    5354 
    5455    IMPLICIT NONE 
    … …  
    7273      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: split_freq_format 
    7374      TYPE(txios(duration))  , OPTIONAL, INTENT(IN) :: sync_freq 
     75      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter 
    7476      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type 
    7577 
    … …  
    7779      ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    7880      , mode, name, name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format  & 
    79       , sync_freq, type ) 
     81      , sync_freq, time_counter, type ) 
    8082 
    8183  END SUBROUTINE xios(set_filegroup_attr_hdl) 
    … …  
    8486    ( filegroup_hdl, append_, compression_level_, description_, enabled_, format_, group_ref_, min_digits_  & 
    8587    , mode_, name_, name_suffix_, output_freq_, output_level_, par_access_, split_freq_, split_freq_format_  & 
    86     , sync_freq_, type_ ) 
     88    , sync_freq_, time_counter_, type_ ) 
    8789 
    8890    IMPLICIT NONE 
    … …  
    106108      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: split_freq_format_ 
    107109      TYPE(txios(duration))  , OPTIONAL, INTENT(IN) :: sync_freq_ 
     110      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter_ 
    108111      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type_ 
    109112 
    … …  
    174177      ENDIF 
    175178 
     179      IF (PRESENT(time_counter_)) THEN 
     180        CALL cxios_set_filegroup_time_counter(filegroup_hdl%daddr, time_counter_, len(time_counter_)) 
     181      ENDIF 
     182 
    176183      IF (PRESENT(type_)) THEN 
    177184        CALL cxios_set_filegroup_type(filegroup_hdl%daddr, type_, len(type_)) 
    … …  
    183190    ( filegroup_id, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    184191    , mode, name, name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format  & 
    185     , sync_freq, type ) 
     192    , sync_freq, time_counter, type ) 
    186193 
    187194    IMPLICIT NONE 
    … …  
    206213      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: split_freq_format 
    207214      TYPE(txios(duration))  , OPTIONAL, INTENT(OUT) :: sync_freq 
     215      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter 
    208216      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type 
    209217 
    … …  
    212220      ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    213221      , mode, name, name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format  & 
    214       , sync_freq, type ) 
     222      , sync_freq, time_counter, type ) 
    215223 
    216224  END SUBROUTINE xios(get_filegroup_attr) 
    … …  
    219227    ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    220228    , mode, name, name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format  & 
    221     , sync_freq, type ) 
     229    , sync_freq, time_counter, type ) 
    222230 
    223231    IMPLICIT NONE 
    … …  
    241249      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: split_freq_format 
    242250      TYPE(txios(duration))  , OPTIONAL, INTENT(OUT) :: sync_freq 
     251      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter 
    243252      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type 
    244253 
    … …  
    246255      ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    247256      , mode, name, name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format  & 
    248       , sync_freq, type ) 
     257      , sync_freq, time_counter, type ) 
    249258 
    250259  END SUBROUTINE xios(get_filegroup_attr_hdl) 
    … …  
    253262    ( filegroup_hdl, append_, compression_level_, description_, enabled_, format_, group_ref_, min_digits_  & 
    254263    , mode_, name_, name_suffix_, output_freq_, output_level_, par_access_, split_freq_, split_freq_format_  & 
    255     , sync_freq_, type_ ) 
     264    , sync_freq_, time_counter_, type_ ) 
    256265 
    257266    IMPLICIT NONE 
    … …  
    275284      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: split_freq_format_ 
    276285      TYPE(txios(duration))  , OPTIONAL, INTENT(OUT) :: sync_freq_ 
     286      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter_ 
    277287      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type_ 
    278288 
    … …  
    343353      ENDIF 
    344354 
     355      IF (PRESENT(time_counter_)) THEN 
     356        CALL cxios_get_filegroup_time_counter(filegroup_hdl%daddr, time_counter_, len(time_counter_)) 
     357      ENDIF 
     358 
    345359      IF (PRESENT(type_)) THEN 
    346360        CALL cxios_get_filegroup_type(filegroup_hdl%daddr, type_, len(type_)) 
    … …  
    352366    ( filegroup_id, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    353367    , mode, name, name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format  & 
    354     , sync_freq, type ) 
     368    , sync_freq, time_counter, type ) 
    355369 
    356370    IMPLICIT NONE 
    … …  
    389403      LOGICAL, OPTIONAL, INTENT(OUT) :: sync_freq 
    390404      LOGICAL(KIND=C_BOOL) :: sync_freq_tmp 
     405      LOGICAL, OPTIONAL, INTENT(OUT) :: time_counter 
     406      LOGICAL(KIND=C_BOOL) :: time_counter_tmp 
    391407      LOGICAL, OPTIONAL, INTENT(OUT) :: type 
    392408      LOGICAL(KIND=C_BOOL) :: type_tmp 
    … …  
    396412      ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    397413      , mode, name, name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format  & 
    398       , sync_freq, type ) 
     414      , sync_freq, time_counter, type ) 
    399415 
    400416  END SUBROUTINE xios(is_defined_filegroup_attr) 
    … …  
    403419    ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    404420    , mode, name, name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format  & 
    405     , sync_freq, type ) 
     421    , sync_freq, time_counter, type ) 
    406422 
    407423    IMPLICIT NONE 
    … …  
    439455      LOGICAL, OPTIONAL, INTENT(OUT) :: sync_freq 
    440456      LOGICAL(KIND=C_BOOL) :: sync_freq_tmp 
     457      LOGICAL, OPTIONAL, INTENT(OUT) :: time_counter 
     458      LOGICAL(KIND=C_BOOL) :: time_counter_tmp 
    441459      LOGICAL, OPTIONAL, INTENT(OUT) :: type 
    442460      LOGICAL(KIND=C_BOOL) :: type_tmp 
    … …  
    445463      ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    446464      , mode, name, name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format  & 
    447       , sync_freq, type ) 
     465      , sync_freq, time_counter, type ) 
    448466 
    449467  END SUBROUTINE xios(is_defined_filegroup_attr_hdl) 
    … …  
    452470    ( filegroup_hdl, append_, compression_level_, description_, enabled_, format_, group_ref_, min_digits_  & 
    453471    , mode_, name_, name_suffix_, output_freq_, output_level_, par_access_, split_freq_, split_freq_format_  & 
    454     , sync_freq_, type_ ) 
     472    , sync_freq_, time_counter_, type_ ) 
    455473 
    456474    IMPLICIT NONE 
    … …  
    488506      LOGICAL, OPTIONAL, INTENT(OUT) :: sync_freq_ 
    489507      LOGICAL(KIND=C_BOOL) :: sync_freq__tmp 
     508      LOGICAL, OPTIONAL, INTENT(OUT) :: time_counter_ 
     509      LOGICAL(KIND=C_BOOL) :: time_counter__tmp 
    490510      LOGICAL, OPTIONAL, INTENT(OUT) :: type_ 
    491511      LOGICAL(KIND=C_BOOL) :: type__tmp 
    … …  
    571591      ENDIF 
    572592 
     593      IF (PRESENT(time_counter_)) THEN 
     594        time_counter__tmp = cxios_is_defined_filegroup_time_counter(filegroup_hdl%daddr) 
     595        time_counter_ = time_counter__tmp 
     596      ENDIF 
     597 
    573598      IF (PRESENT(type_)) THEN 
    574599        type__tmp = cxios_is_defined_filegroup_type(filegroup_hdl%daddr) 
Note: See TracChangeset for help on using the changeset viewer.