Changeset 1170 for XIOS/trunk


Ignore:
Timestamp:
06/15/17 16:17:07 (7 years ago)
Author:
mhnguyen
Message:

Update Fortran interface.

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

Legend:

Unmodified
Added
Removed

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

    r1052 r1170  
    9090 
    9191 
     92  void cxios_set_file_convention_str(file_Ptr file_hdl, const char * convention_str, int convention_str_size) 
     93  { 
     94    std::string convention_str_str; 
     95    if (!cstr2string(convention_str, convention_str_size, convention_str_str)) return; 
     96    CTimer::get("XIOS").resume(); 
     97    file_hdl->convention_str.setValue(convention_str_str); 
     98    CTimer::get("XIOS").suspend(); 
     99  } 
     100 
     101  void cxios_get_file_convention_str(file_Ptr file_hdl, char * convention_str, int convention_str_size) 
     102  { 
     103    CTimer::get("XIOS").resume(); 
     104    if (!string_copy(file_hdl->convention_str.getInheritedValue(), convention_str, convention_str_size)) 
     105      ERROR("void cxios_get_file_convention_str(file_Ptr file_hdl, char * convention_str, int convention_str_size)", << "Input string is too short"); 
     106    CTimer::get("XIOS").suspend(); 
     107  } 
     108 
     109  bool cxios_is_defined_file_convention_str(file_Ptr file_hdl) 
     110  { 
     111     CTimer::get("XIOS").resume(); 
     112     bool isDefined = file_hdl->convention_str.hasInheritedValue(); 
     113     CTimer::get("XIOS").suspend(); 
     114     return isDefined; 
     115  } 
     116 
     117 
    92118  void cxios_set_file_cyclic(file_Ptr file_hdl, bool cyclic) 
    93119  { 

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

    r1052 r1170  
    9090 
    9191 
     92  void cxios_set_filegroup_convention_str(filegroup_Ptr filegroup_hdl, const char * convention_str, int convention_str_size) 
     93  { 
     94    std::string convention_str_str; 
     95    if (!cstr2string(convention_str, convention_str_size, convention_str_str)) return; 
     96    CTimer::get("XIOS").resume(); 
     97    filegroup_hdl->convention_str.setValue(convention_str_str); 
     98    CTimer::get("XIOS").suspend(); 
     99  } 
     100 
     101  void cxios_get_filegroup_convention_str(filegroup_Ptr filegroup_hdl, char * convention_str, int convention_str_size) 
     102  { 
     103    CTimer::get("XIOS").resume(); 
     104    if (!string_copy(filegroup_hdl->convention_str.getInheritedValue(), convention_str, convention_str_size)) 
     105      ERROR("void cxios_get_filegroup_convention_str(filegroup_Ptr filegroup_hdl, char * convention_str, int convention_str_size)", << "Input string is too short"); 
     106    CTimer::get("XIOS").suspend(); 
     107  } 
     108 
     109  bool cxios_is_defined_filegroup_convention_str(filegroup_Ptr filegroup_hdl) 
     110  { 
     111     CTimer::get("XIOS").resume(); 
     112     bool isDefined = filegroup_hdl->convention_str.hasInheritedValue(); 
     113     CTimer::get("XIOS").suspend(); 
     114     return isDefined; 
     115  } 
     116 
     117 
    92118  void cxios_set_filegroup_cyclic(filegroup_Ptr filegroup_hdl, bool cyclic) 
    93119  { 

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

    r1014 r1170  
    6262     CTimer::get("XIOS").resume(); 
    6363     bool isDefined = interpolate_domain_hdl->order.hasInheritedValue(); 
     64     CTimer::get("XIOS").suspend(); 
     65     return isDefined; 
     66  } 
     67 
     68 
     69  void cxios_set_interpolate_domain_quantity(interpolate_domain_Ptr interpolate_domain_hdl, bool quantity) 
     70  { 
     71    CTimer::get("XIOS").resume(); 
     72    interpolate_domain_hdl->quantity.setValue(quantity); 
     73    CTimer::get("XIOS").suspend(); 
     74  } 
     75 
     76  void cxios_get_interpolate_domain_quantity(interpolate_domain_Ptr interpolate_domain_hdl, bool* quantity) 
     77  { 
     78    CTimer::get("XIOS").resume(); 
     79    *quantity = interpolate_domain_hdl->quantity.getInheritedValue(); 
     80    CTimer::get("XIOS").suspend(); 
     81  } 
     82 
     83  bool cxios_is_defined_interpolate_domain_quantity(interpolate_domain_Ptr interpolate_domain_hdl) 
     84  { 
     85     CTimer::get("XIOS").resume(); 
     86     bool isDefined = interpolate_domain_hdl->quantity.hasInheritedValue(); 
    6487     CTimer::get("XIOS").suspend(); 
    6588     return isDefined; 

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

    r787 r1170  
    4141 
    4242 
     43  void cxios_set_zoom_axis_index(zoom_axis_Ptr zoom_axis_hdl, int* index, int* extent) 
     44  { 
     45    CTimer::get("XIOS").resume(); 
     46    CArray<int,1> tmp(index, shape(extent[0]), neverDeleteData); 
     47    zoom_axis_hdl->index.reference(tmp.copy()); 
     48     CTimer::get("XIOS").suspend(); 
     49  } 
     50 
     51  void cxios_get_zoom_axis_index(zoom_axis_Ptr zoom_axis_hdl, int* index, int* extent) 
     52  { 
     53    CTimer::get("XIOS").resume(); 
     54    CArray<int,1> tmp(index, shape(extent[0]), neverDeleteData); 
     55    tmp=zoom_axis_hdl->index.getInheritedValue(); 
     56     CTimer::get("XIOS").suspend(); 
     57  } 
     58 
     59  bool cxios_is_defined_zoom_axis_index(zoom_axis_Ptr zoom_axis_hdl) 
     60  { 
     61     CTimer::get("XIOS").resume(); 
     62     bool isDefined = zoom_axis_hdl->index.hasInheritedValue(); 
     63     CTimer::get("XIOS").suspend(); 
     64     return isDefined; 
     65  } 
     66 
     67 
    4368  void cxios_set_zoom_axis_n(zoom_axis_Ptr zoom_axis_hdl, int n) 
    4469  { 

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

    r1052 r1170  
    6969 
    7070 
     71    SUBROUTINE cxios_set_file_convention_str(file_hdl, convention_str, convention_str_size) BIND(C) 
     72      USE ISO_C_BINDING 
     73      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     74      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: convention_str 
     75      INTEGER  (kind = C_INT)     , VALUE        :: convention_str_size 
     76    END SUBROUTINE cxios_set_file_convention_str 
     77 
     78    SUBROUTINE cxios_get_file_convention_str(file_hdl, convention_str, convention_str_size) BIND(C) 
     79      USE ISO_C_BINDING 
     80      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     81      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: convention_str 
     82      INTEGER  (kind = C_INT)     , VALUE        :: convention_str_size 
     83    END SUBROUTINE cxios_get_file_convention_str 
     84 
     85    FUNCTION cxios_is_defined_file_convention_str(file_hdl) BIND(C) 
     86      USE ISO_C_BINDING 
     87      LOGICAL(kind=C_BOOL) :: cxios_is_defined_file_convention_str 
     88      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     89    END FUNCTION cxios_is_defined_file_convention_str 
     90 
     91 
    7192    SUBROUTINE cxios_set_file_cyclic(file_hdl, cyclic) BIND(C) 
    7293      USE ISO_C_BINDING 

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

    r1052 r1170  
    6969 
    7070 
     71    SUBROUTINE cxios_set_filegroup_convention_str(filegroup_hdl, convention_str, convention_str_size) BIND(C) 
     72      USE ISO_C_BINDING 
     73      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     74      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: convention_str 
     75      INTEGER  (kind = C_INT)     , VALUE        :: convention_str_size 
     76    END SUBROUTINE cxios_set_filegroup_convention_str 
     77 
     78    SUBROUTINE cxios_get_filegroup_convention_str(filegroup_hdl, convention_str, convention_str_size) BIND(C) 
     79      USE ISO_C_BINDING 
     80      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     81      CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: convention_str 
     82      INTEGER  (kind = C_INT)     , VALUE        :: convention_str_size 
     83    END SUBROUTINE cxios_get_filegroup_convention_str 
     84 
     85    FUNCTION cxios_is_defined_filegroup_convention_str(filegroup_hdl) BIND(C) 
     86      USE ISO_C_BINDING 
     87      LOGICAL(kind=C_BOOL) :: cxios_is_defined_filegroup_convention_str 
     88      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     89    END FUNCTION cxios_is_defined_filegroup_convention_str 
     90 
     91 
    7192    SUBROUTINE cxios_set_filegroup_cyclic(filegroup_hdl, cyclic) BIND(C) 
    7293      USE ISO_C_BINDING 

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

    r1052 r1170  
    1212 
    1313  SUBROUTINE xios(set_file_attr)  & 
    14     ( file_id, append, compression_level, convention, cyclic, description, enabled, format, min_digits  & 
    15     , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    16     , split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format, time_stamp_name  & 
    17     , time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
     14    ( file_id, append, compression_level, convention, convention_str, cyclic, description, enabled  & 
     15    , format, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
     16    , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     17    , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    1818 
    1919    IMPLICIT NONE 
    … …  
    2424      INTEGER  , OPTIONAL, INTENT(IN) :: compression_level 
    2525      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: convention 
     26      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: convention_str 
    2627      LOGICAL  , OPTIONAL, INTENT(IN) :: cyclic 
    2728      LOGICAL (KIND=C_BOOL) :: cyclic_tmp 
    … …  
    5556      (file_id,file_hdl) 
    5657      CALL xios(set_file_attr_hdl_)   & 
    57       ( file_hdl, append, compression_level, convention, cyclic, description, enabled, format, min_digits  & 
    58       , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    59       , split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format, time_stamp_name  & 
    60       , time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
     58      ( file_hdl, append, compression_level, convention, convention_str, cyclic, description, enabled  & 
     59      , format, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
     60      , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     61      , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    6162 
    6263  END SUBROUTINE xios(set_file_attr) 
    6364 
    6465  SUBROUTINE xios(set_file_attr_hdl)  & 
    65     ( file_hdl, append, compression_level, convention, cyclic, description, enabled, format, min_digits  & 
    66     , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    67     , split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format, time_stamp_name  & 
    68     , time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
     66    ( file_hdl, append, compression_level, convention, convention_str, cyclic, description, enabled  & 
     67    , format, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
     68    , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     69    , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    6970 
    7071    IMPLICIT NONE 
    … …  
    7475      INTEGER  , OPTIONAL, INTENT(IN) :: compression_level 
    7576      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: convention 
     77      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: convention_str 
    7678      LOGICAL  , OPTIONAL, INTENT(IN) :: cyclic 
    7779      LOGICAL (KIND=C_BOOL) :: cyclic_tmp 
    … …  
    103105 
    104106      CALL xios(set_file_attr_hdl_)  & 
    105       ( file_hdl, append, compression_level, convention, cyclic, description, enabled, format, min_digits  & 
    106       , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    107       , split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format, time_stamp_name  & 
    108       , time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
     107      ( file_hdl, append, compression_level, convention, convention_str, cyclic, description, enabled  & 
     108      , format, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
     109      , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     110      , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    109111 
    110112  END SUBROUTINE xios(set_file_attr_hdl) 
    111113 
    112114  SUBROUTINE xios(set_file_attr_hdl_)   & 
    113     ( file_hdl, append_, compression_level_, convention_, cyclic_, description_, enabled_, format_  & 
    114     , min_digits_, mode_, name_, name_suffix_, output_freq_, output_level_, par_access_, record_offset_  & 
    115     , split_freq_, split_freq_format_, sync_freq_, time_counter_, time_counter_name_, time_stamp_format_  & 
    116     , time_stamp_name_, time_units_, timeseries_, ts_prefix_, type_, uuid_format_, uuid_name_ ) 
     115    ( file_hdl, append_, compression_level_, convention_, convention_str_, cyclic_, description_  & 
     116    , enabled_, format_, min_digits_, mode_, name_, name_suffix_, output_freq_, output_level_, par_access_  & 
     117    , record_offset_, split_freq_, split_freq_format_, sync_freq_, time_counter_, time_counter_name_  & 
     118    , time_stamp_format_, time_stamp_name_, time_units_, timeseries_, ts_prefix_, type_, uuid_format_  & 
     119    , uuid_name_ ) 
    117120 
    118121    IMPLICIT NONE 
    … …  
    122125      INTEGER  , OPTIONAL, INTENT(IN) :: compression_level_ 
    123126      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: convention_ 
     127      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: convention_str_ 
    124128      LOGICAL  , OPTIONAL, INTENT(IN) :: cyclic_ 
    125129      LOGICAL (KIND=C_BOOL) :: cyclic__tmp 
    … …  
    166170      ENDIF 
    167171 
     172      IF (PRESENT(convention_str_)) THEN 
     173        CALL cxios_set_file_convention_str & 
     174      (file_hdl%daddr, convention_str_, len(convention_str_)) 
     175      ENDIF 
     176 
    168177      IF (PRESENT(cyclic_)) THEN 
    169178        cyclic__tmp = cyclic_ 
    … …  
    296305 
    297306  SUBROUTINE xios(get_file_attr)  & 
    298     ( file_id, append, compression_level, convention, cyclic, description, enabled, format, min_digits  & 
    299     , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    300     , split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format, time_stamp_name  & 
    301     , time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
     307    ( file_id, append, compression_level, convention, convention_str, cyclic, description, enabled  & 
     308    , format, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
     309    , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     310    , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    302311 
    303312    IMPLICIT NONE 
    … …  
    308317      INTEGER  , OPTIONAL, INTENT(OUT) :: compression_level 
    309318      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: convention 
     319      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: convention_str 
    310320      LOGICAL  , OPTIONAL, INTENT(OUT) :: cyclic 
    311321      LOGICAL (KIND=C_BOOL) :: cyclic_tmp 
    … …  
    339349      (file_id,file_hdl) 
    340350      CALL xios(get_file_attr_hdl_)   & 
    341       ( file_hdl, append, compression_level, convention, cyclic, description, enabled, format, min_digits  & 
    342       , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    343       , split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format, time_stamp_name  & 
    344       , time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
     351      ( file_hdl, append, compression_level, convention, convention_str, cyclic, description, enabled  & 
     352      , format, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
     353      , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     354      , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    345355 
    346356  END SUBROUTINE xios(get_file_attr) 
    347357 
    348358  SUBROUTINE xios(get_file_attr_hdl)  & 
    349     ( file_hdl, append, compression_level, convention, cyclic, description, enabled, format, min_digits  & 
    350     , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    351     , split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format, time_stamp_name  & 
    352     , time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
     359    ( file_hdl, append, compression_level, convention, convention_str, cyclic, description, enabled  & 
     360    , format, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
     361    , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     362    , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    353363 
    354364    IMPLICIT NONE 
    … …  
    358368      INTEGER  , OPTIONAL, INTENT(OUT) :: compression_level 
    359369      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: convention 
     370      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: convention_str 
    360371      LOGICAL  , OPTIONAL, INTENT(OUT) :: cyclic 
    361372      LOGICAL (KIND=C_BOOL) :: cyclic_tmp 
    … …  
    387398 
    388399      CALL xios(get_file_attr_hdl_)  & 
    389       ( file_hdl, append, compression_level, convention, cyclic, description, enabled, format, min_digits  & 
    390       , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    391       , split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format, time_stamp_name  & 
    392       , time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
     400      ( file_hdl, append, compression_level, convention, convention_str, cyclic, description, enabled  & 
     401      , format, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
     402      , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     403      , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    393404 
    394405  END SUBROUTINE xios(get_file_attr_hdl) 
    395406 
    396407  SUBROUTINE xios(get_file_attr_hdl_)   & 
    397     ( file_hdl, append_, compression_level_, convention_, cyclic_, description_, enabled_, format_  & 
    398     , min_digits_, mode_, name_, name_suffix_, output_freq_, output_level_, par_access_, record_offset_  & 
    399     , split_freq_, split_freq_format_, sync_freq_, time_counter_, time_counter_name_, time_stamp_format_  & 
    400     , time_stamp_name_, time_units_, timeseries_, ts_prefix_, type_, uuid_format_, uuid_name_ ) 
     408    ( file_hdl, append_, compression_level_, convention_, convention_str_, cyclic_, description_  & 
     409    , enabled_, format_, min_digits_, mode_, name_, name_suffix_, output_freq_, output_level_, par_access_  & 
     410    , record_offset_, split_freq_, split_freq_format_, sync_freq_, time_counter_, time_counter_name_  & 
     411    , time_stamp_format_, time_stamp_name_, time_units_, timeseries_, ts_prefix_, type_, uuid_format_  & 
     412    , uuid_name_ ) 
    401413 
    402414    IMPLICIT NONE 
    … …  
    406418      INTEGER  , OPTIONAL, INTENT(OUT) :: compression_level_ 
    407419      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: convention_ 
     420      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: convention_str_ 
    408421      LOGICAL  , OPTIONAL, INTENT(OUT) :: cyclic_ 
    409422      LOGICAL (KIND=C_BOOL) :: cyclic__tmp 
    … …  
    450463      ENDIF 
    451464 
     465      IF (PRESENT(convention_str_)) THEN 
     466        CALL cxios_get_file_convention_str & 
     467      (file_hdl%daddr, convention_str_, len(convention_str_)) 
     468      ENDIF 
     469 
    452470      IF (PRESENT(cyclic_)) THEN 
    453471        CALL cxios_get_file_cyclic & 
    … …  
    580598 
    581599  SUBROUTINE xios(is_defined_file_attr)  & 
    582     ( file_id, append, compression_level, convention, cyclic, description, enabled, format, min_digits  & 
    583     , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    584     , split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format, time_stamp_name  & 
    585     , time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
     600    ( file_id, append, compression_level, convention, convention_str, cyclic, description, enabled  & 
     601    , format, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
     602    , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     603    , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    586604 
    587605    IMPLICIT NONE 
    … …  
    594612      LOGICAL, OPTIONAL, INTENT(OUT) :: convention 
    595613      LOGICAL(KIND=C_BOOL) :: convention_tmp 
     614      LOGICAL, OPTIONAL, INTENT(OUT) :: convention_str 
     615      LOGICAL(KIND=C_BOOL) :: convention_str_tmp 
    596616      LOGICAL, OPTIONAL, INTENT(OUT) :: cyclic 
    597617      LOGICAL(KIND=C_BOOL) :: cyclic_tmp 
    … …  
    648668      (file_id,file_hdl) 
    649669      CALL xios(is_defined_file_attr_hdl_)   & 
    650       ( file_hdl, append, compression_level, convention, cyclic, description, enabled, format, min_digits  & 
    651       , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    652       , split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format, time_stamp_name  & 
    653       , time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
     670      ( file_hdl, append, compression_level, convention, convention_str, cyclic, description, enabled  & 
     671      , format, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
     672      , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     673      , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    654674 
    655675  END SUBROUTINE xios(is_defined_file_attr) 
    656676 
    657677  SUBROUTINE xios(is_defined_file_attr_hdl)  & 
    658     ( file_hdl, append, compression_level, convention, cyclic, description, enabled, format, min_digits  & 
    659     , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    660     , split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format, time_stamp_name  & 
    661     , time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
     678    ( file_hdl, append, compression_level, convention, convention_str, cyclic, description, enabled  & 
     679    , format, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
     680    , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     681    , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    662682 
    663683    IMPLICIT NONE 
    … …  
    669689      LOGICAL, OPTIONAL, INTENT(OUT) :: convention 
    670690      LOGICAL(KIND=C_BOOL) :: convention_tmp 
     691      LOGICAL, OPTIONAL, INTENT(OUT) :: convention_str 
     692      LOGICAL(KIND=C_BOOL) :: convention_str_tmp 
    671693      LOGICAL, OPTIONAL, INTENT(OUT) :: cyclic 
    672694      LOGICAL(KIND=C_BOOL) :: cyclic_tmp 
    … …  
    721743 
    722744      CALL xios(is_defined_file_attr_hdl_)  & 
    723       ( file_hdl, append, compression_level, convention, cyclic, description, enabled, format, min_digits  & 
    724       , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
    725       , split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format, time_stamp_name  & 
    726       , time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
     745      ( file_hdl, append, compression_level, convention, convention_str, cyclic, description, enabled  & 
     746      , format, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
     747      , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     748      , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    727749 
    728750  END SUBROUTINE xios(is_defined_file_attr_hdl) 
    729751 
    730752  SUBROUTINE xios(is_defined_file_attr_hdl_)   & 
    731     ( file_hdl, append_, compression_level_, convention_, cyclic_, description_, enabled_, format_  & 
    732     , min_digits_, mode_, name_, name_suffix_, output_freq_, output_level_, par_access_, record_offset_  & 
    733     , split_freq_, split_freq_format_, sync_freq_, time_counter_, time_counter_name_, time_stamp_format_  & 
    734     , time_stamp_name_, time_units_, timeseries_, ts_prefix_, type_, uuid_format_, uuid_name_ ) 
     753    ( file_hdl, append_, compression_level_, convention_, convention_str_, cyclic_, description_  & 
     754    , enabled_, format_, min_digits_, mode_, name_, name_suffix_, output_freq_, output_level_, par_access_  & 
     755    , record_offset_, split_freq_, split_freq_format_, sync_freq_, time_counter_, time_counter_name_  & 
     756    , time_stamp_format_, time_stamp_name_, time_units_, timeseries_, ts_prefix_, type_, uuid_format_  & 
     757    , uuid_name_ ) 
    735758 
    736759    IMPLICIT NONE 
    … …  
    742765      LOGICAL, OPTIONAL, INTENT(OUT) :: convention_ 
    743766      LOGICAL(KIND=C_BOOL) :: convention__tmp 
     767      LOGICAL, OPTIONAL, INTENT(OUT) :: convention_str_ 
     768      LOGICAL(KIND=C_BOOL) :: convention_str__tmp 
    744769      LOGICAL, OPTIONAL, INTENT(OUT) :: cyclic_ 
    745770      LOGICAL(KIND=C_BOOL) :: cyclic__tmp 
    … …  
    811836      ENDIF 
    812837 
     838      IF (PRESENT(convention_str_)) THEN 
     839        convention_str__tmp = cxios_is_defined_file_convention_str & 
     840      (file_hdl%daddr) 
     841        convention_str_ = convention_str__tmp 
     842      ENDIF 
     843 
    813844      IF (PRESENT(cyclic_)) THEN 
    814845        cyclic__tmp = cxios_is_defined_file_cyclic & 

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

    r1052 r1170  
    1212 
    1313  SUBROUTINE xios(set_filegroup_attr)  & 
    14     ( filegroup_id, append, compression_level, convention, cyclic, description, enabled, format  & 
    15     , group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
    16     , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     14    ( filegroup_id, append, compression_level, convention, convention_str, cyclic, description, enabled  & 
     15    , format, group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access  & 
     16    , record_offset, split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
    1717    , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    1818 
    … …  
    2424      INTEGER  , OPTIONAL, INTENT(IN) :: compression_level 
    2525      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: convention 
     26      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: convention_str 
    2627      LOGICAL  , OPTIONAL, INTENT(IN) :: cyclic 
    2728      LOGICAL (KIND=C_BOOL) :: cyclic_tmp 
    … …  
    5657      (filegroup_id,filegroup_hdl) 
    5758      CALL xios(set_filegroup_attr_hdl_)   & 
    58       ( filegroup_hdl, append, compression_level, convention, cyclic, description, enabled, format  & 
    59       , group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
    60       , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
    61       , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
     59      ( filegroup_hdl, append, compression_level, convention, convention_str, cyclic, description  & 
     60      , enabled, format, group_ref, min_digits, mode, name, name_suffix, output_freq, output_level  & 
     61      , par_access, record_offset, split_freq, split_freq_format, sync_freq, time_counter, time_counter_name  & 
     62      , time_stamp_format, time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name  & 
     63       ) 
    6264 
    6365  END SUBROUTINE xios(set_filegroup_attr) 
    6466 
    6567  SUBROUTINE xios(set_filegroup_attr_hdl)  & 
    66     ( filegroup_hdl, append, compression_level, convention, cyclic, description, enabled, format  & 
    67     , group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
    68     , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
    69     , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
     68    ( filegroup_hdl, append, compression_level, convention, convention_str, cyclic, description  & 
     69    , enabled, format, group_ref, min_digits, mode, name, name_suffix, output_freq, output_level  & 
     70    , par_access, record_offset, split_freq, split_freq_format, sync_freq, time_counter, time_counter_name  & 
     71    , time_stamp_format, time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name  & 
     72     ) 
    7073 
    7174    IMPLICIT NONE 
    … …  
    7578      INTEGER  , OPTIONAL, INTENT(IN) :: compression_level 
    7679      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: convention 
     80      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: convention_str 
    7781      LOGICAL  , OPTIONAL, INTENT(IN) :: cyclic 
    7882      LOGICAL (KIND=C_BOOL) :: cyclic_tmp 
    … …  
    105109 
    106110      CALL xios(set_filegroup_attr_hdl_)  & 
    107       ( filegroup_hdl, append, compression_level, convention, cyclic, description, enabled, format  & 
    108       , group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
    109       , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
    110       , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
     111      ( filegroup_hdl, append, compression_level, convention, convention_str, cyclic, description  & 
     112      , enabled, format, group_ref, min_digits, mode, name, name_suffix, output_freq, output_level  & 
     113      , par_access, record_offset, split_freq, split_freq_format, sync_freq, time_counter, time_counter_name  & 
     114      , time_stamp_format, time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name  & 
     115       ) 
    111116 
    112117  END SUBROUTINE xios(set_filegroup_attr_hdl) 
    113118 
    114119  SUBROUTINE xios(set_filegroup_attr_hdl_)   & 
    115     ( filegroup_hdl, append_, compression_level_, convention_, cyclic_, description_, enabled_, format_  & 
    116     , group_ref_, min_digits_, mode_, name_, name_suffix_, output_freq_, output_level_, par_access_  & 
    117     , record_offset_, split_freq_, split_freq_format_, sync_freq_, time_counter_, time_counter_name_  & 
     120    ( filegroup_hdl, append_, compression_level_, convention_, convention_str_, cyclic_, description_  & 
     121    , enabled_, format_, group_ref_, min_digits_, mode_, name_, name_suffix_, output_freq_, output_level_  & 
     122    , par_access_, record_offset_, split_freq_, split_freq_format_, sync_freq_, time_counter_, time_counter_name_  & 
    118123    , time_stamp_format_, time_stamp_name_, time_units_, timeseries_, ts_prefix_, type_, uuid_format_  & 
    119124    , uuid_name_ ) 
    … …  
    125130      INTEGER  , OPTIONAL, INTENT(IN) :: compression_level_ 
    126131      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: convention_ 
     132      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: convention_str_ 
    127133      LOGICAL  , OPTIONAL, INTENT(IN) :: cyclic_ 
    128134      LOGICAL (KIND=C_BOOL) :: cyclic__tmp 
    … …  
    170176      ENDIF 
    171177 
     178      IF (PRESENT(convention_str_)) THEN 
     179        CALL cxios_set_filegroup_convention_str & 
     180      (filegroup_hdl%daddr, convention_str_, len(convention_str_)) 
     181      ENDIF 
     182 
    172183      IF (PRESENT(cyclic_)) THEN 
    173184        cyclic__tmp = cyclic_ 
    … …  
    305316 
    306317  SUBROUTINE xios(get_filegroup_attr)  & 
    307     ( filegroup_id, append, compression_level, convention, cyclic, description, enabled, format  & 
    308     , group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
    309     , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     318    ( filegroup_id, append, compression_level, convention, convention_str, cyclic, description, enabled  & 
     319    , format, group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access  & 
     320    , record_offset, split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
    310321    , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    311322 
    … …  
    317328      INTEGER  , OPTIONAL, INTENT(OUT) :: compression_level 
    318329      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: convention 
     330      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: convention_str 
    319331      LOGICAL  , OPTIONAL, INTENT(OUT) :: cyclic 
    320332      LOGICAL (KIND=C_BOOL) :: cyclic_tmp 
    … …  
    349361      (filegroup_id,filegroup_hdl) 
    350362      CALL xios(get_filegroup_attr_hdl_)   & 
    351       ( filegroup_hdl, append, compression_level, convention, cyclic, description, enabled, format  & 
    352       , group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
    353       , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
    354       , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
     363      ( filegroup_hdl, append, compression_level, convention, convention_str, cyclic, description  & 
     364      , enabled, format, group_ref, min_digits, mode, name, name_suffix, output_freq, output_level  & 
     365      , par_access, record_offset, split_freq, split_freq_format, sync_freq, time_counter, time_counter_name  & 
     366      , time_stamp_format, time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name  & 
     367       ) 
    355368 
    356369  END SUBROUTINE xios(get_filegroup_attr) 
    357370 
    358371  SUBROUTINE xios(get_filegroup_attr_hdl)  & 
    359     ( filegroup_hdl, append, compression_level, convention, cyclic, description, enabled, format  & 
    360     , group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
    361     , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
    362     , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
     372    ( filegroup_hdl, append, compression_level, convention, convention_str, cyclic, description  & 
     373    , enabled, format, group_ref, min_digits, mode, name, name_suffix, output_freq, output_level  & 
     374    , par_access, record_offset, split_freq, split_freq_format, sync_freq, time_counter, time_counter_name  & 
     375    , time_stamp_format, time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name  & 
     376     ) 
    363377 
    364378    IMPLICIT NONE 
    … …  
    368382      INTEGER  , OPTIONAL, INTENT(OUT) :: compression_level 
    369383      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: convention 
     384      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: convention_str 
    370385      LOGICAL  , OPTIONAL, INTENT(OUT) :: cyclic 
    371386      LOGICAL (KIND=C_BOOL) :: cyclic_tmp 
    … …  
    398413 
    399414      CALL xios(get_filegroup_attr_hdl_)  & 
    400       ( filegroup_hdl, append, compression_level, convention, cyclic, description, enabled, format  & 
    401       , group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
    402       , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
    403       , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
     415      ( filegroup_hdl, append, compression_level, convention, convention_str, cyclic, description  & 
     416      , enabled, format, group_ref, min_digits, mode, name, name_suffix, output_freq, output_level  & 
     417      , par_access, record_offset, split_freq, split_freq_format, sync_freq, time_counter, time_counter_name  & 
     418      , time_stamp_format, time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name  & 
     419       ) 
    404420 
    405421  END SUBROUTINE xios(get_filegroup_attr_hdl) 
    406422 
    407423  SUBROUTINE xios(get_filegroup_attr_hdl_)   & 
    408     ( filegroup_hdl, append_, compression_level_, convention_, cyclic_, description_, enabled_, format_  & 
    409     , group_ref_, min_digits_, mode_, name_, name_suffix_, output_freq_, output_level_, par_access_  & 
    410     , record_offset_, split_freq_, split_freq_format_, sync_freq_, time_counter_, time_counter_name_  & 
     424    ( filegroup_hdl, append_, compression_level_, convention_, convention_str_, cyclic_, description_  & 
     425    , enabled_, format_, group_ref_, min_digits_, mode_, name_, name_suffix_, output_freq_, output_level_  & 
     426    , par_access_, record_offset_, split_freq_, split_freq_format_, sync_freq_, time_counter_, time_counter_name_  & 
    411427    , time_stamp_format_, time_stamp_name_, time_units_, timeseries_, ts_prefix_, type_, uuid_format_  & 
    412428    , uuid_name_ ) 
    … …  
    418434      INTEGER  , OPTIONAL, INTENT(OUT) :: compression_level_ 
    419435      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: convention_ 
     436      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: convention_str_ 
    420437      LOGICAL  , OPTIONAL, INTENT(OUT) :: cyclic_ 
    421438      LOGICAL (KIND=C_BOOL) :: cyclic__tmp 
    … …  
    463480      ENDIF 
    464481 
     482      IF (PRESENT(convention_str_)) THEN 
     483        CALL cxios_get_filegroup_convention_str & 
     484      (filegroup_hdl%daddr, convention_str_, len(convention_str_)) 
     485      ENDIF 
     486 
    465487      IF (PRESENT(cyclic_)) THEN 
    466488        CALL cxios_get_filegroup_cyclic & 
    … …  
    598620 
    599621  SUBROUTINE xios(is_defined_filegroup_attr)  & 
    600     ( filegroup_id, append, compression_level, convention, cyclic, description, enabled, format  & 
    601     , group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
    602     , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
     622    ( filegroup_id, append, compression_level, convention, convention_str, cyclic, description, enabled  & 
     623    , format, group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access  & 
     624    , record_offset, split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
    603625    , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
    604626 
    … …  
    612634      LOGICAL, OPTIONAL, INTENT(OUT) :: convention 
    613635      LOGICAL(KIND=C_BOOL) :: convention_tmp 
     636      LOGICAL, OPTIONAL, INTENT(OUT) :: convention_str 
     637      LOGICAL(KIND=C_BOOL) :: convention_str_tmp 
    614638      LOGICAL, OPTIONAL, INTENT(OUT) :: cyclic 
    615639      LOGICAL(KIND=C_BOOL) :: cyclic_tmp 
    … …  
    668692      (filegroup_id,filegroup_hdl) 
    669693      CALL xios(is_defined_filegroup_attr_hdl_)   & 
    670       ( filegroup_hdl, append, compression_level, convention, cyclic, description, enabled, format  & 
    671       , group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
    672       , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
    673       , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
     694      ( filegroup_hdl, append, compression_level, convention, convention_str, cyclic, description  & 
     695      , enabled, format, group_ref, min_digits, mode, name, name_suffix, output_freq, output_level  & 
     696      , par_access, record_offset, split_freq, split_freq_format, sync_freq, time_counter, time_counter_name  & 
     697      , time_stamp_format, time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name  & 
     698       ) 
    674699 
    675700  END SUBROUTINE xios(is_defined_filegroup_attr) 
    676701 
    677702  SUBROUTINE xios(is_defined_filegroup_attr_hdl)  & 
    678     ( filegroup_hdl, append, compression_level, convention, cyclic, description, enabled, format  & 
    679     , group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
    680     , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
    681     , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
     703    ( filegroup_hdl, append, compression_level, convention, convention_str, cyclic, description  & 
     704    , enabled, format, group_ref, min_digits, mode, name, name_suffix, output_freq, output_level  & 
     705    , par_access, record_offset, split_freq, split_freq_format, sync_freq, time_counter, time_counter_name  & 
     706    , time_stamp_format, time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name  & 
     707     ) 
    682708 
    683709    IMPLICIT NONE 
    … …  
    689715      LOGICAL, OPTIONAL, INTENT(OUT) :: convention 
    690716      LOGICAL(KIND=C_BOOL) :: convention_tmp 
     717      LOGICAL, OPTIONAL, INTENT(OUT) :: convention_str 
     718      LOGICAL(KIND=C_BOOL) :: convention_str_tmp 
    691719      LOGICAL, OPTIONAL, INTENT(OUT) :: cyclic 
    692720      LOGICAL(KIND=C_BOOL) :: cyclic_tmp 
    … …  
    743771 
    744772      CALL xios(is_defined_filegroup_attr_hdl_)  & 
    745       ( filegroup_hdl, append, compression_level, convention, cyclic, description, enabled, format  & 
    746       , group_ref, min_digits, mode, name, name_suffix, output_freq, output_level, par_access, record_offset  & 
    747       , split_freq, split_freq_format, sync_freq, time_counter, time_counter_name, time_stamp_format  & 
    748       , time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name ) 
     773      ( filegroup_hdl, append, compression_level, convention, convention_str, cyclic, description  & 
     774      , enabled, format, group_ref, min_digits, mode, name, name_suffix, output_freq, output_level  & 
     775      , par_access, record_offset, split_freq, split_freq_format, sync_freq, time_counter, time_counter_name  & 
     776      , time_stamp_format, time_stamp_name, time_units, timeseries, ts_prefix, type, uuid_format, uuid_name  & 
     777       ) 
    749778 
    750779  END SUBROUTINE xios(is_defined_filegroup_attr_hdl) 
    751780 
    752781  SUBROUTINE xios(is_defined_filegroup_attr_hdl_)   & 
    753     ( filegroup_hdl, append_, compression_level_, convention_, cyclic_, description_, enabled_, format_  & 
    754     , group_ref_, min_digits_, mode_, name_, name_suffix_, output_freq_, output_level_, par_access_  & 
    755     , record_offset_, split_freq_, split_freq_format_, sync_freq_, time_counter_, time_counter_name_  & 
     782    ( filegroup_hdl, append_, compression_level_, convention_, convention_str_, cyclic_, description_  & 
     783    , enabled_, format_, group_ref_, min_digits_, mode_, name_, name_suffix_, output_freq_, output_level_  & 
     784    , par_access_, record_offset_, split_freq_, split_freq_format_, sync_freq_, time_counter_, time_counter_name_  & 
    756785    , time_stamp_format_, time_stamp_name_, time_units_, timeseries_, ts_prefix_, type_, uuid_format_  & 
    757786    , uuid_name_ ) 
    … …  
    765794      LOGICAL, OPTIONAL, INTENT(OUT) :: convention_ 
    766795      LOGICAL(KIND=C_BOOL) :: convention__tmp 
     796      LOGICAL, OPTIONAL, INTENT(OUT) :: convention_str_ 
     797      LOGICAL(KIND=C_BOOL) :: convention_str__tmp 
    767798      LOGICAL, OPTIONAL, INTENT(OUT) :: cyclic_ 
    768799      LOGICAL(KIND=C_BOOL) :: cyclic__tmp 
    … …  
    836867      ENDIF 
    837868 
     869      IF (PRESENT(convention_str_)) THEN 
     870        convention_str__tmp = cxios_is_defined_filegroup_convention_str & 
     871      (filegroup_hdl%daddr) 
     872        convention_str_ = convention_str__tmp 
     873      ENDIF 
     874 
    838875      IF (PRESENT(cyclic_)) THEN 
    839876        cyclic__tmp = cxios_is_defined_filegroup_cyclic & 

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

    r1040 r1170  
    1212 
    1313  SUBROUTINE xios(set_interpolate_domain_attr)  & 
    14     ( interpolate_domain_id, mode, order, renormalize, weight_filename, write_weight ) 
     14    ( interpolate_domain_id, mode, order, quantity, renormalize, weight_filename, write_weight ) 
    1515 
    1616    IMPLICIT NONE 
    … …  
    1919      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: mode 
    2020      INTEGER  , OPTIONAL, INTENT(IN) :: order 
     21      LOGICAL  , OPTIONAL, INTENT(IN) :: quantity 
     22      LOGICAL (KIND=C_BOOL) :: quantity_tmp 
    2123      LOGICAL  , OPTIONAL, INTENT(IN) :: renormalize 
    2224      LOGICAL (KIND=C_BOOL) :: renormalize_tmp 
    … …  
    2830      (interpolate_domain_id,interpolate_domain_hdl) 
    2931      CALL xios(set_interpolate_domain_attr_hdl_)   & 
    30       ( interpolate_domain_hdl, mode, order, renormalize, weight_filename, write_weight ) 
     32      ( interpolate_domain_hdl, mode, order, quantity, renormalize, weight_filename, write_weight  & 
     33       ) 
    3134 
    3235  END SUBROUTINE xios(set_interpolate_domain_attr) 
    3336 
    3437  SUBROUTINE xios(set_interpolate_domain_attr_hdl)  & 
    35     ( interpolate_domain_hdl, mode, order, renormalize, weight_filename, write_weight ) 
     38    ( interpolate_domain_hdl, mode, order, quantity, renormalize, weight_filename, write_weight  & 
     39     ) 
    3640 
    3741    IMPLICIT NONE 
    … …  
    3943      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: mode 
    4044      INTEGER  , OPTIONAL, INTENT(IN) :: order 
     45      LOGICAL  , OPTIONAL, INTENT(IN) :: quantity 
     46      LOGICAL (KIND=C_BOOL) :: quantity_tmp 
    4147      LOGICAL  , OPTIONAL, INTENT(IN) :: renormalize 
    4248      LOGICAL (KIND=C_BOOL) :: renormalize_tmp 
    … …  
    4652 
    4753      CALL xios(set_interpolate_domain_attr_hdl_)  & 
    48       ( interpolate_domain_hdl, mode, order, renormalize, weight_filename, write_weight ) 
     54      ( interpolate_domain_hdl, mode, order, quantity, renormalize, weight_filename, write_weight  & 
     55       ) 
    4956 
    5057  END SUBROUTINE xios(set_interpolate_domain_attr_hdl) 
    5158 
    5259  SUBROUTINE xios(set_interpolate_domain_attr_hdl_)   & 
    53     ( interpolate_domain_hdl, mode_, order_, renormalize_, weight_filename_, write_weight_ ) 
     60    ( interpolate_domain_hdl, mode_, order_, quantity_, renormalize_, weight_filename_, write_weight_  & 
     61     ) 
    5462 
    5563    IMPLICIT NONE 
    … …  
    5765      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: mode_ 
    5866      INTEGER  , OPTIONAL, INTENT(IN) :: order_ 
     67      LOGICAL  , OPTIONAL, INTENT(IN) :: quantity_ 
     68      LOGICAL (KIND=C_BOOL) :: quantity__tmp 
    5969      LOGICAL  , OPTIONAL, INTENT(IN) :: renormalize_ 
    6070      LOGICAL (KIND=C_BOOL) :: renormalize__tmp 
    … …  
    7383      ENDIF 
    7484 
     85      IF (PRESENT(quantity_)) THEN 
     86        quantity__tmp = quantity_ 
     87        CALL cxios_set_interpolate_domain_quantity & 
     88      (interpolate_domain_hdl%daddr, quantity__tmp) 
     89      ENDIF 
     90 
    7591      IF (PRESENT(renormalize_)) THEN 
    7692        renormalize__tmp = renormalize_ 
    … …  
    93109 
    94110  SUBROUTINE xios(get_interpolate_domain_attr)  & 
    95     ( interpolate_domain_id, mode, order, renormalize, weight_filename, write_weight ) 
     111    ( interpolate_domain_id, mode, order, quantity, renormalize, weight_filename, write_weight ) 
    96112 
    97113    IMPLICIT NONE 
    … …  
    100116      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: mode 
    101117      INTEGER  , OPTIONAL, INTENT(OUT) :: order 
     118      LOGICAL  , OPTIONAL, INTENT(OUT) :: quantity 
     119      LOGICAL (KIND=C_BOOL) :: quantity_tmp 
    102120      LOGICAL  , OPTIONAL, INTENT(OUT) :: renormalize 
    103121      LOGICAL (KIND=C_BOOL) :: renormalize_tmp 
    … …  
    109127      (interpolate_domain_id,interpolate_domain_hdl) 
    110128      CALL xios(get_interpolate_domain_attr_hdl_)   & 
    111       ( interpolate_domain_hdl, mode, order, renormalize, weight_filename, write_weight ) 
     129      ( interpolate_domain_hdl, mode, order, quantity, renormalize, weight_filename, write_weight  & 
     130       ) 
    112131 
    113132  END SUBROUTINE xios(get_interpolate_domain_attr) 
    114133 
    115134  SUBROUTINE xios(get_interpolate_domain_attr_hdl)  & 
    116     ( interpolate_domain_hdl, mode, order, renormalize, weight_filename, write_weight ) 
     135    ( interpolate_domain_hdl, mode, order, quantity, renormalize, weight_filename, write_weight  & 
     136     ) 
    117137 
    118138    IMPLICIT NONE 
    … …  
    120140      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: mode 
    121141      INTEGER  , OPTIONAL, INTENT(OUT) :: order 
     142      LOGICAL  , OPTIONAL, INTENT(OUT) :: quantity 
     143      LOGICAL (KIND=C_BOOL) :: quantity_tmp 
    122144      LOGICAL  , OPTIONAL, INTENT(OUT) :: renormalize 
    123145      LOGICAL (KIND=C_BOOL) :: renormalize_tmp 
    … …  
    127149 
    128150      CALL xios(get_interpolate_domain_attr_hdl_)  & 
    129       ( interpolate_domain_hdl, mode, order, renormalize, weight_filename, write_weight ) 
     151      ( interpolate_domain_hdl, mode, order, quantity, renormalize, weight_filename, write_weight  & 
     152       ) 
    130153 
    131154  END SUBROUTINE xios(get_interpolate_domain_attr_hdl) 
    132155 
    133156  SUBROUTINE xios(get_interpolate_domain_attr_hdl_)   & 
    134     ( interpolate_domain_hdl, mode_, order_, renormalize_, weight_filename_, write_weight_ ) 
     157    ( interpolate_domain_hdl, mode_, order_, quantity_, renormalize_, weight_filename_, write_weight_  & 
     158     ) 
    135159 
    136160    IMPLICIT NONE 
    … …  
    138162      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: mode_ 
    139163      INTEGER  , OPTIONAL, INTENT(OUT) :: order_ 
     164      LOGICAL  , OPTIONAL, INTENT(OUT) :: quantity_ 
     165      LOGICAL (KIND=C_BOOL) :: quantity__tmp 
    140166      LOGICAL  , OPTIONAL, INTENT(OUT) :: renormalize_ 
    141167      LOGICAL (KIND=C_BOOL) :: renormalize__tmp 
    … …  
    154180      ENDIF 
    155181 
     182      IF (PRESENT(quantity_)) THEN 
     183        CALL cxios_get_interpolate_domain_quantity & 
     184      (interpolate_domain_hdl%daddr, quantity__tmp) 
     185        quantity_ = quantity__tmp 
     186      ENDIF 
     187 
    156188      IF (PRESENT(renormalize_)) THEN 
    157189        CALL cxios_get_interpolate_domain_renormalize & 
    … …  
    174206 
    175207  SUBROUTINE xios(is_defined_interpolate_domain_attr)  & 
    176     ( interpolate_domain_id, mode, order, renormalize, weight_filename, write_weight ) 
     208    ( interpolate_domain_id, mode, order, quantity, renormalize, weight_filename, write_weight ) 
    177209 
    178210    IMPLICIT NONE 
    … …  
    183215      LOGICAL, OPTIONAL, INTENT(OUT) :: order 
    184216      LOGICAL(KIND=C_BOOL) :: order_tmp 
     217      LOGICAL, OPTIONAL, INTENT(OUT) :: quantity 
     218      LOGICAL(KIND=C_BOOL) :: quantity_tmp 
    185219      LOGICAL, OPTIONAL, INTENT(OUT) :: renormalize 
    186220      LOGICAL(KIND=C_BOOL) :: renormalize_tmp 
    … …  
    193227      (interpolate_domain_id,interpolate_domain_hdl) 
    194228      CALL xios(is_defined_interpolate_domain_attr_hdl_)   & 
    195       ( interpolate_domain_hdl, mode, order, renormalize, weight_filename, write_weight ) 
     229      ( interpolate_domain_hdl, mode, order, quantity, renormalize, weight_filename, write_weight  & 
     230       ) 
    196231 
    197232  END SUBROUTINE xios(is_defined_interpolate_domain_attr) 
    198233 
    199234  SUBROUTINE xios(is_defined_interpolate_domain_attr_hdl)  & 
    200     ( interpolate_domain_hdl, mode, order, renormalize, weight_filename, write_weight ) 
     235    ( interpolate_domain_hdl, mode, order, quantity, renormalize, weight_filename, write_weight  & 
     236     ) 
    201237 
    202238    IMPLICIT NONE 
    … …  
    206242      LOGICAL, OPTIONAL, INTENT(OUT) :: order 
    207243      LOGICAL(KIND=C_BOOL) :: order_tmp 
     244      LOGICAL, OPTIONAL, INTENT(OUT) :: quantity 
     245      LOGICAL(KIND=C_BOOL) :: quantity_tmp 
    208246      LOGICAL, OPTIONAL, INTENT(OUT) :: renormalize 
    209247      LOGICAL(KIND=C_BOOL) :: renormalize_tmp 
    … …  
    214252 
    215253      CALL xios(is_defined_interpolate_domain_attr_hdl_)  & 
    216       ( interpolate_domain_hdl, mode, order, renormalize, weight_filename, write_weight ) 
     254      ( interpolate_domain_hdl, mode, order, quantity, renormalize, weight_filename, write_weight  & 
     255       ) 
    217256 
    218257  END SUBROUTINE xios(is_defined_interpolate_domain_attr_hdl) 
    219258 
    220259  SUBROUTINE xios(is_defined_interpolate_domain_attr_hdl_)   & 
    221     ( interpolate_domain_hdl, mode_, order_, renormalize_, weight_filename_, write_weight_ ) 
     260    ( interpolate_domain_hdl, mode_, order_, quantity_, renormalize_, weight_filename_, write_weight_  & 
     261     ) 
    222262 
    223263    IMPLICIT NONE 
    … …  
    227267      LOGICAL, OPTIONAL, INTENT(OUT) :: order_ 
    228268      LOGICAL(KIND=C_BOOL) :: order__tmp 
     269      LOGICAL, OPTIONAL, INTENT(OUT) :: quantity_ 
     270      LOGICAL(KIND=C_BOOL) :: quantity__tmp 
    229271      LOGICAL, OPTIONAL, INTENT(OUT) :: renormalize_ 
    230272      LOGICAL(KIND=C_BOOL) :: renormalize__tmp 
    … …  
    246288      ENDIF 
    247289 
     290      IF (PRESENT(quantity_)) THEN 
     291        quantity__tmp = cxios_is_defined_interpolate_domain_quantity & 
     292      (interpolate_domain_hdl%daddr) 
     293        quantity_ = quantity__tmp 
     294      ENDIF 
     295 
    248296      IF (PRESENT(renormalize_)) THEN 
    249297        renormalize__tmp = cxios_is_defined_interpolate_domain_renormalize & 

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

    r1040 r1170  
    4848      INTEGER (kind = C_INTPTR_T), VALUE :: interpolate_domain_hdl 
    4949    END FUNCTION cxios_is_defined_interpolate_domain_order 
     50 
     51 
     52    SUBROUTINE cxios_set_interpolate_domain_quantity(interpolate_domain_hdl, quantity) BIND(C) 
     53      USE ISO_C_BINDING 
     54      INTEGER (kind = C_INTPTR_T), VALUE :: interpolate_domain_hdl 
     55      LOGICAL (KIND=C_BOOL)      , VALUE :: quantity 
     56    END SUBROUTINE cxios_set_interpolate_domain_quantity 
     57 
     58    SUBROUTINE cxios_get_interpolate_domain_quantity(interpolate_domain_hdl, quantity) BIND(C) 
     59      USE ISO_C_BINDING 
     60      INTEGER (kind = C_INTPTR_T), VALUE :: interpolate_domain_hdl 
     61      LOGICAL (KIND=C_BOOL)             :: quantity 
     62    END SUBROUTINE cxios_get_interpolate_domain_quantity 
     63 
     64    FUNCTION cxios_is_defined_interpolate_domain_quantity(interpolate_domain_hdl) BIND(C) 
     65      USE ISO_C_BINDING 
     66      LOGICAL(kind=C_BOOL) :: cxios_is_defined_interpolate_domain_quantity 
     67      INTEGER (kind = C_INTPTR_T), VALUE :: interpolate_domain_hdl 
     68    END FUNCTION cxios_is_defined_interpolate_domain_quantity 
    5069 
    5170 

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

    r966 r1170  
    1212 
    1313  SUBROUTINE xios(set_zoom_axis_attr)  & 
    14     ( zoom_axis_id, begin, n ) 
     14    ( zoom_axis_id, begin, index, n ) 
    1515 
    1616    IMPLICIT NONE 
    … …  
    1818      CHARACTER(LEN=*), INTENT(IN) ::zoom_axis_id 
    1919      INTEGER  , OPTIONAL, INTENT(IN) :: begin 
     20      INTEGER  , OPTIONAL, INTENT(IN) :: index(:) 
    2021      INTEGER  , OPTIONAL, INTENT(IN) :: n 
    2122 
    … …  
    2324      (zoom_axis_id,zoom_axis_hdl) 
    2425      CALL xios(set_zoom_axis_attr_hdl_)   & 
    25       ( zoom_axis_hdl, begin, n ) 
     26      ( zoom_axis_hdl, begin, index, n ) 
    2627 
    2728  END SUBROUTINE xios(set_zoom_axis_attr) 
    2829 
    2930  SUBROUTINE xios(set_zoom_axis_attr_hdl)  & 
    30     ( zoom_axis_hdl, begin, n ) 
     31    ( zoom_axis_hdl, begin, index, n ) 
    3132 
    3233    IMPLICIT NONE 
    3334      TYPE(txios(zoom_axis)) , INTENT(IN) :: zoom_axis_hdl 
    3435      INTEGER  , OPTIONAL, INTENT(IN) :: begin 
     36      INTEGER  , OPTIONAL, INTENT(IN) :: index(:) 
    3537      INTEGER  , OPTIONAL, INTENT(IN) :: n 
    3638 
    3739      CALL xios(set_zoom_axis_attr_hdl_)  & 
    38       ( zoom_axis_hdl, begin, n ) 
     40      ( zoom_axis_hdl, begin, index, n ) 
    3941 
    4042  END SUBROUTINE xios(set_zoom_axis_attr_hdl) 
    4143 
    4244  SUBROUTINE xios(set_zoom_axis_attr_hdl_)   & 
    43     ( zoom_axis_hdl, begin_, n_ ) 
     45    ( zoom_axis_hdl, begin_, index_, n_ ) 
    4446 
    4547    IMPLICIT NONE 
    4648      TYPE(txios(zoom_axis)) , INTENT(IN) :: zoom_axis_hdl 
    4749      INTEGER  , OPTIONAL, INTENT(IN) :: begin_ 
     50      INTEGER  , OPTIONAL, INTENT(IN) :: index_(:) 
    4851      INTEGER  , OPTIONAL, INTENT(IN) :: n_ 
    4952 
    … …  
    5154        CALL cxios_set_zoom_axis_begin & 
    5255      (zoom_axis_hdl%daddr, begin_) 
     56      ENDIF 
     57 
     58      IF (PRESENT(index_)) THEN 
     59        CALL cxios_set_zoom_axis_index & 
     60      (zoom_axis_hdl%daddr, index_, SHAPE(index_)) 
    5361      ENDIF 
    5462 
    … …  
    6169 
    6270  SUBROUTINE xios(get_zoom_axis_attr)  & 
    63     ( zoom_axis_id, begin, n ) 
     71    ( zoom_axis_id, begin, index, n ) 
    6472 
    6573    IMPLICIT NONE 
    … …  
    6775      CHARACTER(LEN=*), INTENT(IN) ::zoom_axis_id 
    6876      INTEGER  , OPTIONAL, INTENT(OUT) :: begin 
     77      INTEGER  , OPTIONAL, INTENT(OUT) :: index(:) 
    6978      INTEGER  , OPTIONAL, INTENT(OUT) :: n 
    7079 
    … …  
    7281      (zoom_axis_id,zoom_axis_hdl) 
    7382      CALL xios(get_zoom_axis_attr_hdl_)   & 
    74       ( zoom_axis_hdl, begin, n ) 
     83      ( zoom_axis_hdl, begin, index, n ) 
    7584 
    7685  END SUBROUTINE xios(get_zoom_axis_attr) 
    7786 
    7887  SUBROUTINE xios(get_zoom_axis_attr_hdl)  & 
    79     ( zoom_axis_hdl, begin, n ) 
     88    ( zoom_axis_hdl, begin, index, n ) 
    8089 
    8190    IMPLICIT NONE 
    8291      TYPE(txios(zoom_axis)) , INTENT(IN) :: zoom_axis_hdl 
    8392      INTEGER  , OPTIONAL, INTENT(OUT) :: begin 
     93      INTEGER  , OPTIONAL, INTENT(OUT) :: index(:) 
    8494      INTEGER  , OPTIONAL, INTENT(OUT) :: n 
    8595 
    8696      CALL xios(get_zoom_axis_attr_hdl_)  & 
    87       ( zoom_axis_hdl, begin, n ) 
     97      ( zoom_axis_hdl, begin, index, n ) 
    8898 
    8999  END SUBROUTINE xios(get_zoom_axis_attr_hdl) 
    90100 
    91101  SUBROUTINE xios(get_zoom_axis_attr_hdl_)   & 
    92     ( zoom_axis_hdl, begin_, n_ ) 
     102    ( zoom_axis_hdl, begin_, index_, n_ ) 
    93103 
    94104    IMPLICIT NONE 
    95105      TYPE(txios(zoom_axis)) , INTENT(IN) :: zoom_axis_hdl 
    96106      INTEGER  , OPTIONAL, INTENT(OUT) :: begin_ 
     107      INTEGER  , OPTIONAL, INTENT(OUT) :: index_(:) 
    97108      INTEGER  , OPTIONAL, INTENT(OUT) :: n_ 
    98109 
    … …  
    100111        CALL cxios_get_zoom_axis_begin & 
    101112      (zoom_axis_hdl%daddr, begin_) 
     113      ENDIF 
     114 
     115      IF (PRESENT(index_)) THEN 
     116        CALL cxios_get_zoom_axis_index & 
     117      (zoom_axis_hdl%daddr, index_, SHAPE(index_)) 
    102118      ENDIF 
    103119 
    … …  
    110126 
    111127  SUBROUTINE xios(is_defined_zoom_axis_attr)  & 
    112     ( zoom_axis_id, begin, n ) 
     128    ( zoom_axis_id, begin, index, n ) 
    113129 
    114130    IMPLICIT NONE 
    … …  
    117133      LOGICAL, OPTIONAL, INTENT(OUT) :: begin 
    118134      LOGICAL(KIND=C_BOOL) :: begin_tmp 
     135      LOGICAL, OPTIONAL, INTENT(OUT) :: index 
     136      LOGICAL(KIND=C_BOOL) :: index_tmp 
    119137      LOGICAL, OPTIONAL, INTENT(OUT) :: n 
    120138      LOGICAL(KIND=C_BOOL) :: n_tmp 
    … …  
    123141      (zoom_axis_id,zoom_axis_hdl) 
    124142      CALL xios(is_defined_zoom_axis_attr_hdl_)   & 
    125       ( zoom_axis_hdl, begin, n ) 
     143      ( zoom_axis_hdl, begin, index, n ) 
    126144 
    127145  END SUBROUTINE xios(is_defined_zoom_axis_attr) 
    128146 
    129147  SUBROUTINE xios(is_defined_zoom_axis_attr_hdl)  & 
    130     ( zoom_axis_hdl, begin, n ) 
     148    ( zoom_axis_hdl, begin, index, n ) 
    131149 
    132150    IMPLICIT NONE 
    … …  
    134152      LOGICAL, OPTIONAL, INTENT(OUT) :: begin 
    135153      LOGICAL(KIND=C_BOOL) :: begin_tmp 
     154      LOGICAL, OPTIONAL, INTENT(OUT) :: index 
     155      LOGICAL(KIND=C_BOOL) :: index_tmp 
    136156      LOGICAL, OPTIONAL, INTENT(OUT) :: n 
    137157      LOGICAL(KIND=C_BOOL) :: n_tmp 
    138158 
    139159      CALL xios(is_defined_zoom_axis_attr_hdl_)  & 
    140       ( zoom_axis_hdl, begin, n ) 
     160      ( zoom_axis_hdl, begin, index, n ) 
    141161 
    142162  END SUBROUTINE xios(is_defined_zoom_axis_attr_hdl) 
    143163 
    144164  SUBROUTINE xios(is_defined_zoom_axis_attr_hdl_)   & 
    145     ( zoom_axis_hdl, begin_, n_ ) 
     165    ( zoom_axis_hdl, begin_, index_, n_ ) 
    146166 
    147167    IMPLICIT NONE 
    … …  
    149169      LOGICAL, OPTIONAL, INTENT(OUT) :: begin_ 
    150170      LOGICAL(KIND=C_BOOL) :: begin__tmp 
     171      LOGICAL, OPTIONAL, INTENT(OUT) :: index_ 
     172      LOGICAL(KIND=C_BOOL) :: index__tmp 
    151173      LOGICAL, OPTIONAL, INTENT(OUT) :: n_ 
    152174      LOGICAL(KIND=C_BOOL) :: n__tmp 
    … …  
    156178      (zoom_axis_hdl%daddr) 
    157179        begin_ = begin__tmp 
     180      ENDIF 
     181 
     182      IF (PRESENT(index_)) THEN 
     183        index__tmp = cxios_is_defined_zoom_axis_index & 
     184      (zoom_axis_hdl%daddr) 
     185        index_ = index__tmp 
    158186      ENDIF 
    159187 

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

    r787 r1170  
    2929 
    3030 
     31    SUBROUTINE cxios_set_zoom_axis_index(zoom_axis_hdl, index, extent) BIND(C) 
     32      USE ISO_C_BINDING 
     33      INTEGER (kind = C_INTPTR_T), VALUE       :: zoom_axis_hdl 
     34      INTEGER (KIND=C_INT)     , DIMENSION(*) :: index 
     35      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
     36    END SUBROUTINE cxios_set_zoom_axis_index 
     37 
     38    SUBROUTINE cxios_get_zoom_axis_index(zoom_axis_hdl, index, extent) BIND(C) 
     39      USE ISO_C_BINDING 
     40      INTEGER (kind = C_INTPTR_T), VALUE       :: zoom_axis_hdl 
     41      INTEGER (KIND=C_INT)     , DIMENSION(*) :: index 
     42      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
     43    END SUBROUTINE cxios_get_zoom_axis_index 
     44 
     45    FUNCTION cxios_is_defined_zoom_axis_index(zoom_axis_hdl) BIND(C) 
     46      USE ISO_C_BINDING 
     47      LOGICAL(kind=C_BOOL) :: cxios_is_defined_zoom_axis_index 
     48      INTEGER (kind = C_INTPTR_T), VALUE :: zoom_axis_hdl 
     49    END FUNCTION cxios_is_defined_zoom_axis_index 
     50 
     51 
    3152    SUBROUTINE cxios_set_zoom_axis_n(zoom_axis_hdl, n) BIND(C) 
    3253      USE ISO_C_BINDING 
Note: See TracChangeset for help on using the changeset viewer.