Ignore:
Timestamp:
11/30/15 16:21:33 (9 years ago)
Author:
rlacroix
Message:

Add a new file attribute time_counter_name.

Users can now modify the name of the time counter dimension and axis name.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/src/interface/fortran_attr/ifilegroup_attr.F90

    r779 r802  
    1414    ( filegroup_id, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    1515    , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    16     , split_freq_format, sync_freq, time_counter, timeseries, ts_prefix, type ) 
     16    , split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix, type  & 
     17     ) 
    1718 
    1819    IMPLICIT NONE 
     
    3940      TYPE(txios(duration))  , OPTIONAL, INTENT(IN) :: sync_freq 
    4041      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter 
     42      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter_name 
    4143      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: timeseries 
    4244      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: ts_prefix 
     
    4749      ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    4850      , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    49       , split_freq_format, sync_freq, time_counter, timeseries, ts_prefix, type ) 
     51      , split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix, type  & 
     52       ) 
    5053 
    5154  END SUBROUTINE xios(set_filegroup_attr) 
     
    5457    ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    5558    , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    56     , split_freq_format, sync_freq, time_counter, timeseries, ts_prefix, type ) 
     59    , split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix, type  & 
     60     ) 
    5761 
    5862    IMPLICIT NONE 
     
    7882      TYPE(txios(duration))  , OPTIONAL, INTENT(IN) :: sync_freq 
    7983      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter 
     84      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter_name 
    8085      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: timeseries 
    8186      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: ts_prefix 
     
    8590      ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    8691      , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    87       , split_freq_format, sync_freq, time_counter, timeseries, ts_prefix, type ) 
     92      , split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix, type  & 
     93       ) 
    8894 
    8995  END SUBROUTINE xios(set_filegroup_attr_hdl) 
     
    9298    ( filegroup_hdl, append_, compression_level_, description_, enabled_, format_, group_ref_, min_digits_  & 
    9399    , mode_, name_, name_suffix_, output_freq_, output_level_, par_access_, record_offset_, split_freq_  & 
    94     , split_freq_format_, sync_freq_, time_counter_, timeseries_, ts_prefix_, type_ ) 
     100    , split_freq_format_, sync_freq_, time_counter_, time_counter_name_, timeseries_, ts_prefix_  & 
     101    , type_ ) 
    95102 
    96103    IMPLICIT NONE 
     
    116123      TYPE(txios(duration))  , OPTIONAL, INTENT(IN) :: sync_freq_ 
    117124      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter_ 
     125      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter_name_ 
    118126      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: timeseries_ 
    119127      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: ts_prefix_ 
     
    194202      ENDIF 
    195203 
     204      IF (PRESENT(time_counter_name_)) THEN 
     205        CALL cxios_set_filegroup_time_counter_name(filegroup_hdl%daddr, time_counter_name_, len(time_counter_name_)) 
     206      ENDIF 
     207 
    196208      IF (PRESENT(timeseries_)) THEN 
    197209        CALL cxios_set_filegroup_timeseries(filegroup_hdl%daddr, timeseries_, len(timeseries_)) 
     
    211223    ( filegroup_id, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    212224    , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    213     , split_freq_format, sync_freq, time_counter, timeseries, ts_prefix, type ) 
     225    , split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix, type  & 
     226     ) 
    214227 
    215228    IMPLICIT NONE 
     
    236249      TYPE(txios(duration))  , OPTIONAL, INTENT(OUT) :: sync_freq 
    237250      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter 
     251      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter_name 
    238252      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: timeseries 
    239253      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: ts_prefix 
     
    244258      ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    245259      , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    246       , split_freq_format, sync_freq, time_counter, timeseries, ts_prefix, type ) 
     260      , split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix, type  & 
     261       ) 
    247262 
    248263  END SUBROUTINE xios(get_filegroup_attr) 
     
    251266    ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    252267    , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    253     , split_freq_format, sync_freq, time_counter, timeseries, ts_prefix, type ) 
     268    , split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix, type  & 
     269     ) 
    254270 
    255271    IMPLICIT NONE 
     
    275291      TYPE(txios(duration))  , OPTIONAL, INTENT(OUT) :: sync_freq 
    276292      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter 
     293      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter_name 
    277294      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: timeseries 
    278295      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: ts_prefix 
     
    282299      ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    283300      , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    284       , split_freq_format, sync_freq, time_counter, timeseries, ts_prefix, type ) 
     301      , split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix, type  & 
     302       ) 
    285303 
    286304  END SUBROUTINE xios(get_filegroup_attr_hdl) 
     
    289307    ( filegroup_hdl, append_, compression_level_, description_, enabled_, format_, group_ref_, min_digits_  & 
    290308    , mode_, name_, name_suffix_, output_freq_, output_level_, par_access_, record_offset_, split_freq_  & 
    291     , split_freq_format_, sync_freq_, time_counter_, timeseries_, ts_prefix_, type_ ) 
     309    , split_freq_format_, sync_freq_, time_counter_, time_counter_name_, timeseries_, ts_prefix_  & 
     310    , type_ ) 
    292311 
    293312    IMPLICIT NONE 
     
    313332      TYPE(txios(duration))  , OPTIONAL, INTENT(OUT) :: sync_freq_ 
    314333      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter_ 
     334      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter_name_ 
    315335      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: timeseries_ 
    316336      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: ts_prefix_ 
     
    391411      ENDIF 
    392412 
     413      IF (PRESENT(time_counter_name_)) THEN 
     414        CALL cxios_get_filegroup_time_counter_name(filegroup_hdl%daddr, time_counter_name_, len(time_counter_name_)) 
     415      ENDIF 
     416 
    393417      IF (PRESENT(timeseries_)) THEN 
    394418        CALL cxios_get_filegroup_timeseries(filegroup_hdl%daddr, timeseries_, len(timeseries_)) 
     
    408432    ( filegroup_id, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    409433    , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    410     , split_freq_format, sync_freq, time_counter, timeseries, ts_prefix, type ) 
     434    , split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix, type  & 
     435     ) 
    411436 
    412437    IMPLICIT NONE 
     
    449474      LOGICAL, OPTIONAL, INTENT(OUT) :: time_counter 
    450475      LOGICAL(KIND=C_BOOL) :: time_counter_tmp 
     476      LOGICAL, OPTIONAL, INTENT(OUT) :: time_counter_name 
     477      LOGICAL(KIND=C_BOOL) :: time_counter_name_tmp 
    451478      LOGICAL, OPTIONAL, INTENT(OUT) :: timeseries 
    452479      LOGICAL(KIND=C_BOOL) :: timeseries_tmp 
     
    460487      ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    461488      , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    462       , split_freq_format, sync_freq, time_counter, timeseries, ts_prefix, type ) 
     489      , split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix, type  & 
     490       ) 
    463491 
    464492  END SUBROUTINE xios(is_defined_filegroup_attr) 
     
    467495    ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    468496    , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    469     , split_freq_format, sync_freq, time_counter, timeseries, ts_prefix, type ) 
     497    , split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix, type  & 
     498     ) 
    470499 
    471500    IMPLICIT NONE 
     
    507536      LOGICAL, OPTIONAL, INTENT(OUT) :: time_counter 
    508537      LOGICAL(KIND=C_BOOL) :: time_counter_tmp 
     538      LOGICAL, OPTIONAL, INTENT(OUT) :: time_counter_name 
     539      LOGICAL(KIND=C_BOOL) :: time_counter_name_tmp 
    509540      LOGICAL, OPTIONAL, INTENT(OUT) :: timeseries 
    510541      LOGICAL(KIND=C_BOOL) :: timeseries_tmp 
     
    517548      ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    518549      , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    519       , split_freq_format, sync_freq, time_counter, timeseries, ts_prefix, type ) 
     550      , split_freq_format, sync_freq, time_counter, time_counter_name, timeseries, ts_prefix, type  & 
     551       ) 
    520552 
    521553  END SUBROUTINE xios(is_defined_filegroup_attr_hdl) 
     
    524556    ( filegroup_hdl, append_, compression_level_, description_, enabled_, format_, group_ref_, min_digits_  & 
    525557    , mode_, name_, name_suffix_, output_freq_, output_level_, par_access_, record_offset_, split_freq_  & 
    526     , split_freq_format_, sync_freq_, time_counter_, timeseries_, ts_prefix_, type_ ) 
     558    , split_freq_format_, sync_freq_, time_counter_, time_counter_name_, timeseries_, ts_prefix_  & 
     559    , type_ ) 
    527560 
    528561    IMPLICIT NONE 
     
    564597      LOGICAL, OPTIONAL, INTENT(OUT) :: time_counter_ 
    565598      LOGICAL(KIND=C_BOOL) :: time_counter__tmp 
     599      LOGICAL, OPTIONAL, INTENT(OUT) :: time_counter_name_ 
     600      LOGICAL(KIND=C_BOOL) :: time_counter_name__tmp 
    566601      LOGICAL, OPTIONAL, INTENT(OUT) :: timeseries_ 
    567602      LOGICAL(KIND=C_BOOL) :: timeseries__tmp 
     
    661696      ENDIF 
    662697 
     698      IF (PRESENT(time_counter_name_)) THEN 
     699        time_counter_name__tmp = cxios_is_defined_filegroup_time_counter_name(filegroup_hdl%daddr) 
     700        time_counter_name_ = time_counter_name__tmp 
     701      ENDIF 
     702 
    663703      IF (PRESENT(timeseries_)) THEN 
    664704        timeseries__tmp = cxios_is_defined_filegroup_timeseries(filegroup_hdl%daddr) 
Note: See TracChangeset for help on using the changeset viewer.