Ignore:
Timestamp:
11/25/16 14:12:20 (7 years ago)
Author:
mhnguyen
Message:

Updating Fortran interfaces

File:
1 edited

Legend:

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

    r991 r1005  
    1313  SUBROUTINE xios(set_fieldgroup_attr)  & 
    1414    ( fieldgroup_id, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
    15     , detect_missing_value, domain_ref, enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref  & 
    16     , group_ref, indexed_output, level, long_name, name, operation, prec, read_access, scalar_ref  & 
    17     , scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min ) 
     15    , detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op, grid_path  & 
     16    , grid_ref, group_ref, indexed_output, level, long_name, name, operation, prec, read_access  & 
     17    , scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min  & 
     18     ) 
    1819 
    1920    IMPLICIT NONE 
     
    3132      LOGICAL  , OPTIONAL, INTENT(IN) :: enabled 
    3233      LOGICAL (KIND=C_BOOL) :: enabled_tmp 
     34      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: expr 
    3335      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: field_ref 
    3436      TYPE(txios(duration))  , OPTIONAL, INTENT(IN) :: freq_offset 
     
    6062      CALL xios(set_fieldgroup_attr_hdl_)   & 
    6163      ( fieldgroup_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
    62       , detect_missing_value, domain_ref, enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref  & 
    63       , group_ref, indexed_output, level, long_name, name, operation, prec, read_access, scalar_ref  & 
    64       , scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min ) 
     64      , detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op, grid_path  & 
     65      , grid_ref, group_ref, indexed_output, level, long_name, name, operation, prec, read_access  & 
     66      , scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min  & 
     67       ) 
    6568 
    6669  END SUBROUTINE xios(set_fieldgroup_attr) 
     
    6871  SUBROUTINE xios(set_fieldgroup_attr_hdl)  & 
    6972    ( fieldgroup_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
    70     , detect_missing_value, domain_ref, enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref  & 
    71     , group_ref, indexed_output, level, long_name, name, operation, prec, read_access, scalar_ref  & 
    72     , scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min ) 
     73    , detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op, grid_path  & 
     74    , grid_ref, group_ref, indexed_output, level, long_name, name, operation, prec, read_access  & 
     75    , scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min  & 
     76     ) 
    7377 
    7478    IMPLICIT NONE 
     
    8589      LOGICAL  , OPTIONAL, INTENT(IN) :: enabled 
    8690      LOGICAL (KIND=C_BOOL) :: enabled_tmp 
     91      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: expr 
    8792      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: field_ref 
    8893      TYPE(txios(duration))  , OPTIONAL, INTENT(IN) :: freq_offset 
     
    112117      CALL xios(set_fieldgroup_attr_hdl_)  & 
    113118      ( fieldgroup_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
    114       , detect_missing_value, domain_ref, enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref  & 
    115       , group_ref, indexed_output, level, long_name, name, operation, prec, read_access, scalar_ref  & 
    116       , scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min ) 
     119      , detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op, grid_path  & 
     120      , grid_ref, group_ref, indexed_output, level, long_name, name, operation, prec, read_access  & 
     121      , scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min  & 
     122       ) 
    117123 
    118124  END SUBROUTINE xios(set_fieldgroup_attr_hdl) 
     
    120126  SUBROUTINE xios(set_fieldgroup_attr_hdl_)   & 
    121127    ( fieldgroup_hdl, add_offset_, axis_ref_, cell_methods_, cell_methods_mode_, compression_level_  & 
    122     , default_value_, detect_missing_value_, domain_ref_, enabled_, field_ref_, freq_offset_, freq_op_  & 
    123     , grid_path_, grid_ref_, group_ref_, indexed_output_, level_, long_name_, name_, operation_  & 
     128    , default_value_, detect_missing_value_, domain_ref_, enabled_, expr_, field_ref_, freq_offset_  & 
     129    , freq_op_, grid_path_, grid_ref_, group_ref_, indexed_output_, level_, long_name_, name_, operation_  & 
    124130    , prec_, read_access_, scalar_ref_, scale_factor_, standard_name_, ts_enabled_, ts_split_freq_  & 
    125131    , unit_, valid_max_, valid_min_ ) 
     
    138144      LOGICAL  , OPTIONAL, INTENT(IN) :: enabled_ 
    139145      LOGICAL (KIND=C_BOOL) :: enabled__tmp 
     146      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: expr_ 
    140147      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: field_ref_ 
    141148      TYPE(txios(duration))  , OPTIONAL, INTENT(IN) :: freq_offset_ 
     
    210217      ENDIF 
    211218 
     219      IF (PRESENT(expr_)) THEN 
     220        CALL cxios_set_fieldgroup_expr & 
     221      (fieldgroup_hdl%daddr, expr_, len(expr_)) 
     222      ENDIF 
     223 
    212224      IF (PRESENT(field_ref_)) THEN 
    213225        CALL cxios_set_fieldgroup_field_ref & 
     
    322334  SUBROUTINE xios(get_fieldgroup_attr)  & 
    323335    ( fieldgroup_id, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
    324     , detect_missing_value, domain_ref, enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref  & 
    325     , group_ref, indexed_output, level, long_name, name, operation, prec, read_access, scalar_ref  & 
    326     , scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min ) 
     336    , detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op, grid_path  & 
     337    , grid_ref, group_ref, indexed_output, level, long_name, name, operation, prec, read_access  & 
     338    , scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min  & 
     339     ) 
    327340 
    328341    IMPLICIT NONE 
     
    340353      LOGICAL  , OPTIONAL, INTENT(OUT) :: enabled 
    341354      LOGICAL (KIND=C_BOOL) :: enabled_tmp 
     355      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: expr 
    342356      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: field_ref 
    343357      TYPE(txios(duration))  , OPTIONAL, INTENT(OUT) :: freq_offset 
     
    369383      CALL xios(get_fieldgroup_attr_hdl_)   & 
    370384      ( fieldgroup_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
    371       , detect_missing_value, domain_ref, enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref  & 
    372       , group_ref, indexed_output, level, long_name, name, operation, prec, read_access, scalar_ref  & 
    373       , scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min ) 
     385      , detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op, grid_path  & 
     386      , grid_ref, group_ref, indexed_output, level, long_name, name, operation, prec, read_access  & 
     387      , scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min  & 
     388       ) 
    374389 
    375390  END SUBROUTINE xios(get_fieldgroup_attr) 
     
    377392  SUBROUTINE xios(get_fieldgroup_attr_hdl)  & 
    378393    ( fieldgroup_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
    379     , detect_missing_value, domain_ref, enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref  & 
    380     , group_ref, indexed_output, level, long_name, name, operation, prec, read_access, scalar_ref  & 
    381     , scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min ) 
     394    , detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op, grid_path  & 
     395    , grid_ref, group_ref, indexed_output, level, long_name, name, operation, prec, read_access  & 
     396    , scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min  & 
     397     ) 
    382398 
    383399    IMPLICIT NONE 
     
    394410      LOGICAL  , OPTIONAL, INTENT(OUT) :: enabled 
    395411      LOGICAL (KIND=C_BOOL) :: enabled_tmp 
     412      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: expr 
    396413      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: field_ref 
    397414      TYPE(txios(duration))  , OPTIONAL, INTENT(OUT) :: freq_offset 
     
    421438      CALL xios(get_fieldgroup_attr_hdl_)  & 
    422439      ( fieldgroup_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
    423       , detect_missing_value, domain_ref, enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref  & 
    424       , group_ref, indexed_output, level, long_name, name, operation, prec, read_access, scalar_ref  & 
    425       , scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min ) 
     440      , detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op, grid_path  & 
     441      , grid_ref, group_ref, indexed_output, level, long_name, name, operation, prec, read_access  & 
     442      , scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min  & 
     443       ) 
    426444 
    427445  END SUBROUTINE xios(get_fieldgroup_attr_hdl) 
     
    429447  SUBROUTINE xios(get_fieldgroup_attr_hdl_)   & 
    430448    ( fieldgroup_hdl, add_offset_, axis_ref_, cell_methods_, cell_methods_mode_, compression_level_  & 
    431     , default_value_, detect_missing_value_, domain_ref_, enabled_, field_ref_, freq_offset_, freq_op_  & 
    432     , grid_path_, grid_ref_, group_ref_, indexed_output_, level_, long_name_, name_, operation_  & 
     449    , default_value_, detect_missing_value_, domain_ref_, enabled_, expr_, field_ref_, freq_offset_  & 
     450    , freq_op_, grid_path_, grid_ref_, group_ref_, indexed_output_, level_, long_name_, name_, operation_  & 
    433451    , prec_, read_access_, scalar_ref_, scale_factor_, standard_name_, ts_enabled_, ts_split_freq_  & 
    434452    , unit_, valid_max_, valid_min_ ) 
     
    447465      LOGICAL  , OPTIONAL, INTENT(OUT) :: enabled_ 
    448466      LOGICAL (KIND=C_BOOL) :: enabled__tmp 
     467      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: expr_ 
    449468      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: field_ref_ 
    450469      TYPE(txios(duration))  , OPTIONAL, INTENT(OUT) :: freq_offset_ 
     
    519538      ENDIF 
    520539 
     540      IF (PRESENT(expr_)) THEN 
     541        CALL cxios_get_fieldgroup_expr & 
     542      (fieldgroup_hdl%daddr, expr_, len(expr_)) 
     543      ENDIF 
     544 
    521545      IF (PRESENT(field_ref_)) THEN 
    522546        CALL cxios_get_fieldgroup_field_ref & 
     
    631655  SUBROUTINE xios(is_defined_fieldgroup_attr)  & 
    632656    ( fieldgroup_id, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
    633     , detect_missing_value, domain_ref, enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref  & 
    634     , group_ref, indexed_output, level, long_name, name, operation, prec, read_access, scalar_ref  & 
    635     , scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min ) 
     657    , detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op, grid_path  & 
     658    , grid_ref, group_ref, indexed_output, level, long_name, name, operation, prec, read_access  & 
     659    , scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min  & 
     660     ) 
    636661 
    637662    IMPLICIT NONE 
     
    656681      LOGICAL, OPTIONAL, INTENT(OUT) :: enabled 
    657682      LOGICAL(KIND=C_BOOL) :: enabled_tmp 
     683      LOGICAL, OPTIONAL, INTENT(OUT) :: expr 
     684      LOGICAL(KIND=C_BOOL) :: expr_tmp 
    658685      LOGICAL, OPTIONAL, INTENT(OUT) :: field_ref 
    659686      LOGICAL(KIND=C_BOOL) :: field_ref_tmp 
     
    703730      CALL xios(is_defined_fieldgroup_attr_hdl_)   & 
    704731      ( fieldgroup_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
    705       , detect_missing_value, domain_ref, enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref  & 
    706       , group_ref, indexed_output, level, long_name, name, operation, prec, read_access, scalar_ref  & 
    707       , scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min ) 
     732      , detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op, grid_path  & 
     733      , grid_ref, group_ref, indexed_output, level, long_name, name, operation, prec, read_access  & 
     734      , scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min  & 
     735       ) 
    708736 
    709737  END SUBROUTINE xios(is_defined_fieldgroup_attr) 
     
    711739  SUBROUTINE xios(is_defined_fieldgroup_attr_hdl)  & 
    712740    ( fieldgroup_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
    713     , detect_missing_value, domain_ref, enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref  & 
    714     , group_ref, indexed_output, level, long_name, name, operation, prec, read_access, scalar_ref  & 
    715     , scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min ) 
     741    , detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op, grid_path  & 
     742    , grid_ref, group_ref, indexed_output, level, long_name, name, operation, prec, read_access  & 
     743    , scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min  & 
     744     ) 
    716745 
    717746    IMPLICIT NONE 
     
    735764      LOGICAL, OPTIONAL, INTENT(OUT) :: enabled 
    736765      LOGICAL(KIND=C_BOOL) :: enabled_tmp 
     766      LOGICAL, OPTIONAL, INTENT(OUT) :: expr 
     767      LOGICAL(KIND=C_BOOL) :: expr_tmp 
    737768      LOGICAL, OPTIONAL, INTENT(OUT) :: field_ref 
    738769      LOGICAL(KIND=C_BOOL) :: field_ref_tmp 
     
    780811      CALL xios(is_defined_fieldgroup_attr_hdl_)  & 
    781812      ( fieldgroup_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
    782       , detect_missing_value, domain_ref, enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref  & 
    783       , group_ref, indexed_output, level, long_name, name, operation, prec, read_access, scalar_ref  & 
    784       , scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min ) 
     813      , detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op, grid_path  & 
     814      , grid_ref, group_ref, indexed_output, level, long_name, name, operation, prec, read_access  & 
     815      , scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min  & 
     816       ) 
    785817 
    786818  END SUBROUTINE xios(is_defined_fieldgroup_attr_hdl) 
     
    788820  SUBROUTINE xios(is_defined_fieldgroup_attr_hdl_)   & 
    789821    ( fieldgroup_hdl, add_offset_, axis_ref_, cell_methods_, cell_methods_mode_, compression_level_  & 
    790     , default_value_, detect_missing_value_, domain_ref_, enabled_, field_ref_, freq_offset_, freq_op_  & 
    791     , grid_path_, grid_ref_, group_ref_, indexed_output_, level_, long_name_, name_, operation_  & 
     822    , default_value_, detect_missing_value_, domain_ref_, enabled_, expr_, field_ref_, freq_offset_  & 
     823    , freq_op_, grid_path_, grid_ref_, group_ref_, indexed_output_, level_, long_name_, name_, operation_  & 
    792824    , prec_, read_access_, scalar_ref_, scale_factor_, standard_name_, ts_enabled_, ts_split_freq_  & 
    793825    , unit_, valid_max_, valid_min_ ) 
     
    813845      LOGICAL, OPTIONAL, INTENT(OUT) :: enabled_ 
    814846      LOGICAL(KIND=C_BOOL) :: enabled__tmp 
     847      LOGICAL, OPTIONAL, INTENT(OUT) :: expr_ 
     848      LOGICAL(KIND=C_BOOL) :: expr__tmp 
    815849      LOGICAL, OPTIONAL, INTENT(OUT) :: field_ref_ 
    816850      LOGICAL(KIND=C_BOOL) :: field_ref__tmp 
     
    910944      ENDIF 
    911945 
     946      IF (PRESENT(expr_)) THEN 
     947        expr__tmp = cxios_is_defined_fieldgroup_expr & 
     948      (fieldgroup_hdl%daddr) 
     949        expr_ = expr__tmp 
     950      ENDIF 
     951 
    912952      IF (PRESENT(field_ref_)) THEN 
    913953        field_ref__tmp = cxios_is_defined_fieldgroup_field_ref & 
Note: See TracChangeset for help on using the changeset viewer.