Changeset 703


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...

Location:
XIOS/branchs/xios-1.0/src/interface
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • XIOS/branchs/xios-1.0/src/interface/c_attr/icfile_attr.cpp

    r608 r703  
    333333   
    334334   
     335  void cxios_set_file_time_counter(file_Ptr file_hdl, const char * time_counter, int time_counter_size) 
     336  { 
     337    std::string time_counter_str; 
     338    if(!cstr2string(time_counter, time_counter_size, time_counter_str)) return; 
     339     CTimer::get("XIOS").resume(); 
     340    file_hdl->time_counter.fromString(time_counter_str); 
     341    file_hdl->sendAttributToServer(file_hdl->time_counter); 
     342     CTimer::get("XIOS").suspend(); 
     343  } 
     344   
     345  void cxios_get_file_time_counter(file_Ptr file_hdl, char * time_counter, int time_counter_size) 
     346  { 
     347     CTimer::get("XIOS").resume(); 
     348    if(!string_copy(file_hdl->time_counter.getInheritedStringValue(),time_counter , time_counter_size)) 
     349      ERROR("void cxios_get_file_time_counter(file_Ptr file_hdl, char * time_counter, int time_counter_size)", <<"Input string is to short"); 
     350     CTimer::get("XIOS").suspend(); 
     351  } 
     352   
     353  bool cxios_is_defined_file_time_counter(file_Ptr file_hdl ) 
     354  { 
     355    CTimer::get("XIOS").resume(); 
     356    bool isDefined = file_hdl->time_counter.hasInheritedValue(); 
     357    CTimer::get("XIOS").suspend(); 
     358    return isDefined; 
     359  } 
     360   
     361   
     362   
    335363  void cxios_set_file_type(file_Ptr file_hdl, const char * type, int type_size) 
    336364  { 

  • XIOS/branchs/xios-1.0/src/interface/c_attr/icfilegroup_attr.cpp

    r608 r703  
    361361   
    362362   
     363  void cxios_set_filegroup_time_counter(filegroup_Ptr filegroup_hdl, const char * time_counter, int time_counter_size) 
     364  { 
     365    std::string time_counter_str; 
     366    if(!cstr2string(time_counter, time_counter_size, time_counter_str)) return; 
     367     CTimer::get("XIOS").resume(); 
     368    filegroup_hdl->time_counter.fromString(time_counter_str); 
     369    filegroup_hdl->sendAttributToServer(filegroup_hdl->time_counter); 
     370     CTimer::get("XIOS").suspend(); 
     371  } 
     372   
     373  void cxios_get_filegroup_time_counter(filegroup_Ptr filegroup_hdl, char * time_counter, int time_counter_size) 
     374  { 
     375     CTimer::get("XIOS").resume(); 
     376    if(!string_copy(filegroup_hdl->time_counter.getInheritedStringValue(),time_counter , time_counter_size)) 
     377      ERROR("void cxios_get_filegroup_time_counter(filegroup_Ptr filegroup_hdl, char * time_counter, int time_counter_size)", <<"Input string is to short"); 
     378     CTimer::get("XIOS").suspend(); 
     379  } 
     380   
     381  bool cxios_is_defined_filegroup_time_counter(filegroup_Ptr filegroup_hdl ) 
     382  { 
     383    CTimer::get("XIOS").resume(); 
     384    bool isDefined = filegroup_hdl->time_counter.hasInheritedValue(); 
     385    CTimer::get("XIOS").suspend(); 
     386    return isDefined; 
     387  } 
     388   
     389   
     390   
    363391  void cxios_set_filegroup_type(filegroup_Ptr filegroup_hdl, const char * type, int type_size) 
    364392  { 

  • XIOS/branchs/xios-1.0/src/interface/fortran_attr/file_interface_attr.f90

    r608 r703  
    253253     
    254254     
     255    SUBROUTINE cxios_set_file_time_counter(file_hdl, time_counter, time_counter_size) BIND(C) 
     256      USE ISO_C_BINDING 
     257      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     258      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: time_counter 
     259      INTEGER  (kind = C_INT)     , VALUE        :: time_counter_size 
     260    END SUBROUTINE cxios_set_file_time_counter 
     261     
     262    SUBROUTINE cxios_get_file_time_counter(file_hdl, time_counter, time_counter_size) BIND(C) 
     263      USE ISO_C_BINDING 
     264      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     265      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: time_counter 
     266      INTEGER  (kind = C_INT)     , VALUE        :: time_counter_size 
     267    END SUBROUTINE cxios_get_file_time_counter 
     268     
     269    FUNCTION cxios_is_defined_file_time_counter(file_hdl ) BIND(C) 
     270      USE ISO_C_BINDING 
     271      LOGICAL(kind=C_BOOL) :: cxios_is_defined_file_time_counter 
     272      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     273    END FUNCTION cxios_is_defined_file_time_counter 
     274     
     275     
    255276    SUBROUTINE cxios_set_file_type(file_hdl, type, type_size) BIND(C) 
    256277      USE ISO_C_BINDING 

  • XIOS/branchs/xios-1.0/src/interface/fortran_attr/filegroup_interface_attr.f90

    r608 r703  
    274274     
    275275     
     276    SUBROUTINE cxios_set_filegroup_time_counter(filegroup_hdl, time_counter, time_counter_size) BIND(C) 
     277      USE ISO_C_BINDING 
     278      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     279      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: time_counter 
     280      INTEGER  (kind = C_INT)     , VALUE        :: time_counter_size 
     281    END SUBROUTINE cxios_set_filegroup_time_counter 
     282     
     283    SUBROUTINE cxios_get_filegroup_time_counter(filegroup_hdl, time_counter, time_counter_size) BIND(C) 
     284      USE ISO_C_BINDING 
     285      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     286      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: time_counter 
     287      INTEGER  (kind = C_INT)     , VALUE        :: time_counter_size 
     288    END SUBROUTINE cxios_get_filegroup_time_counter 
     289     
     290    FUNCTION cxios_is_defined_filegroup_time_counter(filegroup_hdl ) BIND(C) 
     291      USE ISO_C_BINDING 
     292      LOGICAL(kind=C_BOOL) :: cxios_is_defined_filegroup_time_counter 
     293      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     294    END FUNCTION cxios_is_defined_filegroup_time_counter 
     295     
     296     
    276297    SUBROUTINE cxios_set_filegroup_type(filegroup_hdl, type, type_size) BIND(C) 
    277298      USE ISO_C_BINDING 

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

    r608 r703  
    1313  SUBROUTINE xios(set_file_attr)  & 
    1414    ( file_id, compression_level, description, enabled, min_digits, name, name_suffix, output_freq  & 
    15     , output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     15    , output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter, type ) 
    1616     
    1717    IMPLICIT NONE 
    … …  
    3131      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: split_freq_format 
    3232      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: sync_freq 
     33      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter 
    3334      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type 
    3435       
    … …  
    3637      CALL xios(set_file_attr_hdl_)   & 
    3738      ( file_hdl, compression_level, description, enabled, min_digits, name, name_suffix, output_freq  & 
    38       , output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     39      , output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter, type ) 
    3940     
    4041  END SUBROUTINE xios(set_file_attr) 
    … …  
    4243  SUBROUTINE xios(set_file_attr_hdl)  & 
    4344    ( file_hdl, compression_level, description, enabled, min_digits, name, name_suffix, output_freq  & 
    44     , output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     45    , output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter, type ) 
    4546     
    4647    IMPLICIT NONE 
    … …  
    5960      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: split_freq_format 
    6061      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: sync_freq 
     62      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter 
    6163      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type 
    6264       
    6365      CALL xios(set_file_attr_hdl_)  & 
    6466      ( file_hdl, compression_level, description, enabled, min_digits, name, name_suffix, output_freq  & 
    65       , output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     67      , output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter, type ) 
    6668     
    6769  END SUBROUTINE xios(set_file_attr_hdl) 
    … …  
    6971  SUBROUTINE xios(set_file_attr_hdl_)   & 
    7072    ( file_hdl, compression_level_, description_, enabled_, min_digits_, name_, name_suffix_, output_freq_  & 
    71     , output_level_, par_access_, split_freq_, split_freq_format_, sync_freq_, type_ ) 
     73    , output_level_, par_access_, split_freq_, split_freq_format_, sync_freq_, time_counter_, type_  & 
     74     ) 
    7275     
    7376    IMPLICIT NONE 
    … …  
    8689      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: split_freq_format_ 
    8790      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: sync_freq_ 
     91      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter_ 
    8892      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type_ 
    8993       
    … …  
    137141      ENDIF 
    138142       
     143      IF (PRESENT(time_counter_)) THEN 
     144        CALL cxios_set_file_time_counter(file_hdl%daddr, time_counter_, len(time_counter_)) 
     145      ENDIF 
     146       
    139147      IF (PRESENT(type_)) THEN 
    140148        CALL cxios_set_file_type(file_hdl%daddr, type_, len(type_)) 
    … …  
    147155  SUBROUTINE xios(get_file_attr)  & 
    148156    ( file_id, compression_level, description, enabled, min_digits, name, name_suffix, output_freq  & 
    149     , output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     157    , output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter, type ) 
    150158     
    151159    IMPLICIT NONE 
    … …  
    165173      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: split_freq_format 
    166174      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: sync_freq 
     175      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter 
    167176      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type 
    168177       
    … …  
    170179      CALL xios(get_file_attr_hdl_)   & 
    171180      ( file_hdl, compression_level, description, enabled, min_digits, name, name_suffix, output_freq  & 
    172       , output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     181      , output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter, type ) 
    173182     
    174183  END SUBROUTINE xios(get_file_attr) 
    … …  
    176185  SUBROUTINE xios(get_file_attr_hdl)  & 
    177186    ( file_hdl, compression_level, description, enabled, min_digits, name, name_suffix, output_freq  & 
    178     , output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     187    , output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter, type ) 
    179188     
    180189    IMPLICIT NONE 
    … …  
    193202      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: split_freq_format 
    194203      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: sync_freq 
     204      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter 
    195205      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type 
    196206       
    197207      CALL xios(get_file_attr_hdl_)  & 
    198208      ( file_hdl, compression_level, description, enabled, min_digits, name, name_suffix, output_freq  & 
    199       , output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     209      , output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter, type ) 
    200210     
    201211  END SUBROUTINE xios(get_file_attr_hdl) 
    … …  
    203213  SUBROUTINE xios(get_file_attr_hdl_)   & 
    204214    ( file_hdl, compression_level_, description_, enabled_, min_digits_, name_, name_suffix_, output_freq_  & 
    205     , output_level_, par_access_, split_freq_, split_freq_format_, sync_freq_, type_ ) 
     215    , output_level_, par_access_, split_freq_, split_freq_format_, sync_freq_, time_counter_, type_  & 
     216     ) 
    206217     
    207218    IMPLICIT NONE 
    … …  
    220231      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: split_freq_format_ 
    221232      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: sync_freq_ 
     233      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter_ 
    222234      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type_ 
    223235       
    … …  
    271283      ENDIF 
    272284       
     285      IF (PRESENT(time_counter_)) THEN 
     286        CALL cxios_get_file_time_counter(file_hdl%daddr, time_counter_, len(time_counter_)) 
     287      ENDIF 
     288       
    273289      IF (PRESENT(type_)) THEN 
    274290        CALL cxios_get_file_type(file_hdl%daddr, type_, len(type_)) 
    … …  
    281297  SUBROUTINE xios(is_defined_file_attr)  & 
    282298    ( file_id, compression_level, description, enabled, min_digits, name, name_suffix, output_freq  & 
    283     , output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     299    , output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter, type ) 
    284300     
    285301    IMPLICIT NONE 
    … …  
    310326      LOGICAL, OPTIONAL, INTENT(OUT) :: sync_freq 
    311327      LOGICAL(KIND=C_BOOL) :: sync_freq_tmp 
     328      LOGICAL, OPTIONAL, INTENT(OUT) :: time_counter 
     329      LOGICAL(KIND=C_BOOL) :: time_counter_tmp 
    312330      LOGICAL, OPTIONAL, INTENT(OUT) :: type 
    313331      LOGICAL(KIND=C_BOOL) :: type_tmp 
    … …  
    316334      CALL xios(is_defined_file_attr_hdl_)   & 
    317335      ( file_hdl, compression_level, description, enabled, min_digits, name, name_suffix, output_freq  & 
    318       , output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     336      , output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter, type ) 
    319337     
    320338  END SUBROUTINE xios(is_defined_file_attr) 
    … …  
    322340  SUBROUTINE xios(is_defined_file_attr_hdl)  & 
    323341    ( file_hdl, compression_level, description, enabled, min_digits, name, name_suffix, output_freq  & 
    324     , output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     342    , output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter, type ) 
    325343     
    326344    IMPLICIT NONE 
    … …  
    350368      LOGICAL, OPTIONAL, INTENT(OUT) :: sync_freq 
    351369      LOGICAL(KIND=C_BOOL) :: sync_freq_tmp 
     370      LOGICAL, OPTIONAL, INTENT(OUT) :: time_counter 
     371      LOGICAL(KIND=C_BOOL) :: time_counter_tmp 
    352372      LOGICAL, OPTIONAL, INTENT(OUT) :: type 
    353373      LOGICAL(KIND=C_BOOL) :: type_tmp 
    … …  
    355375      CALL xios(is_defined_file_attr_hdl_)  & 
    356376      ( file_hdl, compression_level, description, enabled, min_digits, name, name_suffix, output_freq  & 
    357       , output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     377      , output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter, type ) 
    358378     
    359379  END SUBROUTINE xios(is_defined_file_attr_hdl) 
    … …  
    361381  SUBROUTINE xios(is_defined_file_attr_hdl_)   & 
    362382    ( file_hdl, compression_level_, description_, enabled_, min_digits_, name_, name_suffix_, output_freq_  & 
    363     , output_level_, par_access_, split_freq_, split_freq_format_, sync_freq_, type_ ) 
     383    , output_level_, par_access_, split_freq_, split_freq_format_, sync_freq_, time_counter_, type_  & 
     384     ) 
    364385     
    365386    IMPLICIT NONE 
    … …  
    389410      LOGICAL, OPTIONAL, INTENT(OUT) :: sync_freq_ 
    390411      LOGICAL(KIND=C_BOOL) :: sync_freq__tmp 
     412      LOGICAL, OPTIONAL, INTENT(OUT) :: time_counter_ 
     413      LOGICAL(KIND=C_BOOL) :: time_counter__tmp 
    391414      LOGICAL, OPTIONAL, INTENT(OUT) :: type_ 
    392415      LOGICAL(KIND=C_BOOL) :: type__tmp 
    … …  
    452475      ENDIF 
    453476       
     477      IF (PRESENT(time_counter_)) THEN 
     478        time_counter__tmp=cxios_is_defined_file_time_counter(file_hdl%daddr) 
     479        time_counter_=time_counter__tmp 
     480      ENDIF 
     481       
    454482      IF (PRESENT(type_)) THEN 
    455483        type__tmp=cxios_is_defined_file_type(file_hdl%daddr) 

  • 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.