Ignore:
Timestamp:
01/10/17 14:36:29 (7 years ago)
Author:
oabramkina
Message:

Intermeadiate version for merging with new server functionalities.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • XIOS/dev/dev_olga/src/interface/fortran_attr/ifieldgroup_attr.F90

    r966 r1021  
    1212 
    1313  SUBROUTINE xios(set_fieldgroup_attr)  & 
    14     ( fieldgroup_id, add_offset, axis_ref, compression_level, default_value, detect_missing_value  & 
    15     , domain_ref, enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref, group_ref, indexed_output  & 
    16     , level, long_name, name, operation, prec, read_access, scalar_ref, scale_factor, standard_name  & 
    17     , ts_enabled, ts_split_freq, unit, valid_max, valid_min ) 
     14    ( fieldgroup_id, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
     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 
    … …  
    2223      REAL (KIND=8) , OPTIONAL, INTENT(IN) :: add_offset 
    2324      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref 
     25      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: cell_methods 
     26      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: cell_methods_mode 
    2427      INTEGER  , OPTIONAL, INTENT(IN) :: compression_level 
    2528      REAL (KIND=8) , OPTIONAL, INTENT(IN) :: default_value 
    … …  
    2932      LOGICAL  , OPTIONAL, INTENT(IN) :: enabled 
    3033      LOGICAL (KIND=C_BOOL) :: enabled_tmp 
     34      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: expr 
    3135      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: field_ref 
    3236      TYPE(txios(duration))  , OPTIONAL, INTENT(IN) :: freq_offset 
    … …  
    5761      (fieldgroup_id,fieldgroup_hdl) 
    5862      CALL xios(set_fieldgroup_attr_hdl_)   & 
    59       ( fieldgroup_hdl, add_offset, axis_ref, compression_level, default_value, detect_missing_value  & 
    60       , domain_ref, enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref, group_ref, indexed_output  & 
    61       , level, long_name, name, operation, prec, read_access, scalar_ref, scale_factor, standard_name  & 
    62       , ts_enabled, ts_split_freq, unit, valid_max, valid_min ) 
     63      ( fieldgroup_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
     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       ) 
    6368 
    6469  END SUBROUTINE xios(set_fieldgroup_attr) 
    6570 
    6671  SUBROUTINE xios(set_fieldgroup_attr_hdl)  & 
    67     ( fieldgroup_hdl, add_offset, axis_ref, compression_level, default_value, detect_missing_value  & 
    68     , domain_ref, enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref, group_ref, indexed_output  & 
    69     , level, long_name, name, operation, prec, read_access, scalar_ref, scale_factor, standard_name  & 
    70     , ts_enabled, ts_split_freq, unit, valid_max, valid_min ) 
     72    ( fieldgroup_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
     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     ) 
    7177 
    7278    IMPLICIT NONE 
    … …  
    7480      REAL (KIND=8) , OPTIONAL, INTENT(IN) :: add_offset 
    7581      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref 
     82      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: cell_methods 
     83      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: cell_methods_mode 
    7684      INTEGER  , OPTIONAL, INTENT(IN) :: compression_level 
    7785      REAL (KIND=8) , OPTIONAL, INTENT(IN) :: default_value 
    … …  
    8189      LOGICAL  , OPTIONAL, INTENT(IN) :: enabled 
    8290      LOGICAL (KIND=C_BOOL) :: enabled_tmp 
     91      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: expr 
    8392      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: field_ref 
    8493      TYPE(txios(duration))  , OPTIONAL, INTENT(IN) :: freq_offset 
    … …  
    107116 
    108117      CALL xios(set_fieldgroup_attr_hdl_)  & 
    109       ( fieldgroup_hdl, add_offset, axis_ref, compression_level, default_value, detect_missing_value  & 
    110       , domain_ref, enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref, group_ref, indexed_output  & 
    111       , level, long_name, name, operation, prec, read_access, scalar_ref, scale_factor, standard_name  & 
    112       , ts_enabled, ts_split_freq, unit, valid_max, valid_min ) 
     118      ( fieldgroup_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
     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       ) 
    113123 
    114124  END SUBROUTINE xios(set_fieldgroup_attr_hdl) 
    115125 
    116126  SUBROUTINE xios(set_fieldgroup_attr_hdl_)   & 
    117     ( fieldgroup_hdl, add_offset_, axis_ref_, compression_level_, default_value_, detect_missing_value_  & 
    118     , domain_ref_, enabled_, field_ref_, freq_offset_, freq_op_, grid_path_, grid_ref_, group_ref_  & 
    119     , indexed_output_, level_, long_name_, name_, operation_, prec_, read_access_, scalar_ref_, scale_factor_  & 
    120     , standard_name_, ts_enabled_, ts_split_freq_, unit_, valid_max_, valid_min_ ) 
     127    ( fieldgroup_hdl, add_offset_, axis_ref_, cell_methods_, cell_methods_mode_, compression_level_  & 
     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_  & 
     130    , prec_, read_access_, scalar_ref_, scale_factor_, standard_name_, ts_enabled_, ts_split_freq_  & 
     131    , unit_, valid_max_, valid_min_ ) 
    121132 
    122133    IMPLICIT NONE 
    … …  
    124135      REAL (KIND=8) , OPTIONAL, INTENT(IN) :: add_offset_ 
    125136      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref_ 
     137      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: cell_methods_ 
     138      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: cell_methods_mode_ 
    126139      INTEGER  , OPTIONAL, INTENT(IN) :: compression_level_ 
    127140      REAL (KIND=8) , OPTIONAL, INTENT(IN) :: default_value_ 
    … …  
    131144      LOGICAL  , OPTIONAL, INTENT(IN) :: enabled_ 
    132145      LOGICAL (KIND=C_BOOL) :: enabled__tmp 
     146      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: expr_ 
    133147      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: field_ref_ 
    134148      TYPE(txios(duration))  , OPTIONAL, INTENT(IN) :: freq_offset_ 
    … …  
    166180      ENDIF 
    167181 
     182      IF (PRESENT(cell_methods_)) THEN 
     183        CALL cxios_set_fieldgroup_cell_methods & 
     184      (fieldgroup_hdl%daddr, cell_methods_, len(cell_methods_)) 
     185      ENDIF 
     186 
     187      IF (PRESENT(cell_methods_mode_)) THEN 
     188        CALL cxios_set_fieldgroup_cell_methods_mode & 
     189      (fieldgroup_hdl%daddr, cell_methods_mode_, len(cell_methods_mode_)) 
     190      ENDIF 
     191 
    168192      IF (PRESENT(compression_level_)) THEN 
    169193        CALL cxios_set_fieldgroup_compression_level & 
    … …  
    193217      ENDIF 
    194218 
     219      IF (PRESENT(expr_)) THEN 
     220        CALL cxios_set_fieldgroup_expr & 
     221      (fieldgroup_hdl%daddr, expr_, len(expr_)) 
     222      ENDIF 
     223 
    195224      IF (PRESENT(field_ref_)) THEN 
    196225        CALL cxios_set_fieldgroup_field_ref & 
    … …  
    304333 
    305334  SUBROUTINE xios(get_fieldgroup_attr)  & 
    306     ( fieldgroup_id, add_offset, axis_ref, compression_level, default_value, detect_missing_value  & 
    307     , domain_ref, enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref, group_ref, indexed_output  & 
    308     , level, long_name, name, operation, prec, read_access, scalar_ref, scale_factor, standard_name  & 
    309     , ts_enabled, ts_split_freq, unit, valid_max, valid_min ) 
     335    ( fieldgroup_id, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
     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     ) 
    310340 
    311341    IMPLICIT NONE 
    … …  
    314344      REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: add_offset 
    315345      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref 
     346      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: cell_methods 
     347      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: cell_methods_mode 
    316348      INTEGER  , OPTIONAL, INTENT(OUT) :: compression_level 
    317349      REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: default_value 
    … …  
    321353      LOGICAL  , OPTIONAL, INTENT(OUT) :: enabled 
    322354      LOGICAL (KIND=C_BOOL) :: enabled_tmp 
     355      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: expr 
    323356      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: field_ref 
    324357      TYPE(txios(duration))  , OPTIONAL, INTENT(OUT) :: freq_offset 
    … …  
    349382      (fieldgroup_id,fieldgroup_hdl) 
    350383      CALL xios(get_fieldgroup_attr_hdl_)   & 
    351       ( fieldgroup_hdl, add_offset, axis_ref, compression_level, default_value, detect_missing_value  & 
    352       , domain_ref, enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref, group_ref, indexed_output  & 
    353       , level, long_name, name, operation, prec, read_access, scalar_ref, scale_factor, standard_name  & 
    354       , ts_enabled, ts_split_freq, unit, valid_max, valid_min ) 
     384      ( fieldgroup_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
     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       ) 
    355389 
    356390  END SUBROUTINE xios(get_fieldgroup_attr) 
    357391 
    358392  SUBROUTINE xios(get_fieldgroup_attr_hdl)  & 
    359     ( fieldgroup_hdl, add_offset, axis_ref, compression_level, default_value, detect_missing_value  & 
    360     , domain_ref, enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref, group_ref, indexed_output  & 
    361     , level, long_name, name, operation, prec, read_access, scalar_ref, scale_factor, standard_name  & 
    362     , ts_enabled, ts_split_freq, unit, valid_max, valid_min ) 
     393    ( fieldgroup_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
     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     ) 
    363398 
    364399    IMPLICIT NONE 
    … …  
    366401      REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: add_offset 
    367402      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref 
     403      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: cell_methods 
     404      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: cell_methods_mode 
    368405      INTEGER  , OPTIONAL, INTENT(OUT) :: compression_level 
    369406      REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: default_value 
    … …  
    373410      LOGICAL  , OPTIONAL, INTENT(OUT) :: enabled 
    374411      LOGICAL (KIND=C_BOOL) :: enabled_tmp 
     412      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: expr 
    375413      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: field_ref 
    376414      TYPE(txios(duration))  , OPTIONAL, INTENT(OUT) :: freq_offset 
    … …  
    399437 
    400438      CALL xios(get_fieldgroup_attr_hdl_)  & 
    401       ( fieldgroup_hdl, add_offset, axis_ref, compression_level, default_value, detect_missing_value  & 
    402       , domain_ref, enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref, group_ref, indexed_output  & 
    403       , level, long_name, name, operation, prec, read_access, scalar_ref, scale_factor, standard_name  & 
    404       , ts_enabled, ts_split_freq, unit, valid_max, valid_min ) 
     439      ( fieldgroup_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
     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       ) 
    405444 
    406445  END SUBROUTINE xios(get_fieldgroup_attr_hdl) 
    407446 
    408447  SUBROUTINE xios(get_fieldgroup_attr_hdl_)   & 
    409     ( fieldgroup_hdl, add_offset_, axis_ref_, compression_level_, default_value_, detect_missing_value_  & 
    410     , domain_ref_, enabled_, field_ref_, freq_offset_, freq_op_, grid_path_, grid_ref_, group_ref_  & 
    411     , indexed_output_, level_, long_name_, name_, operation_, prec_, read_access_, scalar_ref_, scale_factor_  & 
    412     , standard_name_, ts_enabled_, ts_split_freq_, unit_, valid_max_, valid_min_ ) 
     448    ( fieldgroup_hdl, add_offset_, axis_ref_, cell_methods_, cell_methods_mode_, compression_level_  & 
     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_  & 
     451    , prec_, read_access_, scalar_ref_, scale_factor_, standard_name_, ts_enabled_, ts_split_freq_  & 
     452    , unit_, valid_max_, valid_min_ ) 
    413453 
    414454    IMPLICIT NONE 
    … …  
    416456      REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: add_offset_ 
    417457      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref_ 
     458      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: cell_methods_ 
     459      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: cell_methods_mode_ 
    418460      INTEGER  , OPTIONAL, INTENT(OUT) :: compression_level_ 
    419461      REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: default_value_ 
    … …  
    423465      LOGICAL  , OPTIONAL, INTENT(OUT) :: enabled_ 
    424466      LOGICAL (KIND=C_BOOL) :: enabled__tmp 
     467      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: expr_ 
    425468      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: field_ref_ 
    426469      TYPE(txios(duration))  , OPTIONAL, INTENT(OUT) :: freq_offset_ 
    … …  
    458501      ENDIF 
    459502 
     503      IF (PRESENT(cell_methods_)) THEN 
     504        CALL cxios_get_fieldgroup_cell_methods & 
     505      (fieldgroup_hdl%daddr, cell_methods_, len(cell_methods_)) 
     506      ENDIF 
     507 
     508      IF (PRESENT(cell_methods_mode_)) THEN 
     509        CALL cxios_get_fieldgroup_cell_methods_mode & 
     510      (fieldgroup_hdl%daddr, cell_methods_mode_, len(cell_methods_mode_)) 
     511      ENDIF 
     512 
    460513      IF (PRESENT(compression_level_)) THEN 
    461514        CALL cxios_get_fieldgroup_compression_level & 
    … …  
    485538      ENDIF 
    486539 
     540      IF (PRESENT(expr_)) THEN 
     541        CALL cxios_get_fieldgroup_expr & 
     542      (fieldgroup_hdl%daddr, expr_, len(expr_)) 
     543      ENDIF 
     544 
    487545      IF (PRESENT(field_ref_)) THEN 
    488546        CALL cxios_get_fieldgroup_field_ref & 
    … …  
    596654 
    597655  SUBROUTINE xios(is_defined_fieldgroup_attr)  & 
    598     ( fieldgroup_id, add_offset, axis_ref, compression_level, default_value, detect_missing_value  & 
    599     , domain_ref, enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref, group_ref, indexed_output  & 
    600     , level, long_name, name, operation, prec, read_access, scalar_ref, scale_factor, standard_name  & 
    601     , ts_enabled, ts_split_freq, unit, valid_max, valid_min ) 
     656    ( fieldgroup_id, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
     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     ) 
    602661 
    603662    IMPLICIT NONE 
    … …  
    608667      LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref 
    609668      LOGICAL(KIND=C_BOOL) :: axis_ref_tmp 
     669      LOGICAL, OPTIONAL, INTENT(OUT) :: cell_methods 
     670      LOGICAL(KIND=C_BOOL) :: cell_methods_tmp 
     671      LOGICAL, OPTIONAL, INTENT(OUT) :: cell_methods_mode 
     672      LOGICAL(KIND=C_BOOL) :: cell_methods_mode_tmp 
    610673      LOGICAL, OPTIONAL, INTENT(OUT) :: compression_level 
    611674      LOGICAL(KIND=C_BOOL) :: compression_level_tmp 
    … …  
    618681      LOGICAL, OPTIONAL, INTENT(OUT) :: enabled 
    619682      LOGICAL(KIND=C_BOOL) :: enabled_tmp 
     683      LOGICAL, OPTIONAL, INTENT(OUT) :: expr 
     684      LOGICAL(KIND=C_BOOL) :: expr_tmp 
    620685      LOGICAL, OPTIONAL, INTENT(OUT) :: field_ref 
    621686      LOGICAL(KIND=C_BOOL) :: field_ref_tmp 
    … …  
    664729      (fieldgroup_id,fieldgroup_hdl) 
    665730      CALL xios(is_defined_fieldgroup_attr_hdl_)   & 
    666       ( fieldgroup_hdl, add_offset, axis_ref, compression_level, default_value, detect_missing_value  & 
    667       , domain_ref, enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref, group_ref, indexed_output  & 
    668       , level, long_name, name, operation, prec, read_access, scalar_ref, scale_factor, standard_name  & 
    669       , ts_enabled, ts_split_freq, unit, valid_max, valid_min ) 
     731      ( fieldgroup_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
     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       ) 
    670736 
    671737  END SUBROUTINE xios(is_defined_fieldgroup_attr) 
    672738 
    673739  SUBROUTINE xios(is_defined_fieldgroup_attr_hdl)  & 
    674     ( fieldgroup_hdl, add_offset, axis_ref, compression_level, default_value, detect_missing_value  & 
    675     , domain_ref, enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref, group_ref, indexed_output  & 
    676     , level, long_name, name, operation, prec, read_access, scalar_ref, scale_factor, standard_name  & 
    677     , ts_enabled, ts_split_freq, unit, valid_max, valid_min ) 
     740    ( fieldgroup_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
     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     ) 
    678745 
    679746    IMPLICIT NONE 
    … …  
    683750      LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref 
    684751      LOGICAL(KIND=C_BOOL) :: axis_ref_tmp 
     752      LOGICAL, OPTIONAL, INTENT(OUT) :: cell_methods 
     753      LOGICAL(KIND=C_BOOL) :: cell_methods_tmp 
     754      LOGICAL, OPTIONAL, INTENT(OUT) :: cell_methods_mode 
     755      LOGICAL(KIND=C_BOOL) :: cell_methods_mode_tmp 
    685756      LOGICAL, OPTIONAL, INTENT(OUT) :: compression_level 
    686757      LOGICAL(KIND=C_BOOL) :: compression_level_tmp 
    … …  
    693764      LOGICAL, OPTIONAL, INTENT(OUT) :: enabled 
    694765      LOGICAL(KIND=C_BOOL) :: enabled_tmp 
     766      LOGICAL, OPTIONAL, INTENT(OUT) :: expr 
     767      LOGICAL(KIND=C_BOOL) :: expr_tmp 
    695768      LOGICAL, OPTIONAL, INTENT(OUT) :: field_ref 
    696769      LOGICAL(KIND=C_BOOL) :: field_ref_tmp 
    … …  
    737810 
    738811      CALL xios(is_defined_fieldgroup_attr_hdl_)  & 
    739       ( fieldgroup_hdl, add_offset, axis_ref, compression_level, default_value, detect_missing_value  & 
    740       , domain_ref, enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref, group_ref, indexed_output  & 
    741       , level, long_name, name, operation, prec, read_access, scalar_ref, scale_factor, standard_name  & 
    742       , ts_enabled, ts_split_freq, unit, valid_max, valid_min ) 
     812      ( fieldgroup_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
     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       ) 
    743817 
    744818  END SUBROUTINE xios(is_defined_fieldgroup_attr_hdl) 
    745819 
    746820  SUBROUTINE xios(is_defined_fieldgroup_attr_hdl_)   & 
    747     ( fieldgroup_hdl, add_offset_, axis_ref_, compression_level_, default_value_, detect_missing_value_  & 
    748     , domain_ref_, enabled_, field_ref_, freq_offset_, freq_op_, grid_path_, grid_ref_, group_ref_  & 
    749     , indexed_output_, level_, long_name_, name_, operation_, prec_, read_access_, scalar_ref_, scale_factor_  & 
    750     , standard_name_, ts_enabled_, ts_split_freq_, unit_, valid_max_, valid_min_ ) 
     821    ( fieldgroup_hdl, add_offset_, axis_ref_, cell_methods_, cell_methods_mode_, compression_level_  & 
     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_  & 
     824    , prec_, read_access_, scalar_ref_, scale_factor_, standard_name_, ts_enabled_, ts_split_freq_  & 
     825    , unit_, valid_max_, valid_min_ ) 
    751826 
    752827    IMPLICIT NONE 
    … …  
    756831      LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref_ 
    757832      LOGICAL(KIND=C_BOOL) :: axis_ref__tmp 
     833      LOGICAL, OPTIONAL, INTENT(OUT) :: cell_methods_ 
     834      LOGICAL(KIND=C_BOOL) :: cell_methods__tmp 
     835      LOGICAL, OPTIONAL, INTENT(OUT) :: cell_methods_mode_ 
     836      LOGICAL(KIND=C_BOOL) :: cell_methods_mode__tmp 
    758837      LOGICAL, OPTIONAL, INTENT(OUT) :: compression_level_ 
    759838      LOGICAL(KIND=C_BOOL) :: compression_level__tmp 
    … …  
    766845      LOGICAL, OPTIONAL, INTENT(OUT) :: enabled_ 
    767846      LOGICAL(KIND=C_BOOL) :: enabled__tmp 
     847      LOGICAL, OPTIONAL, INTENT(OUT) :: expr_ 
     848      LOGICAL(KIND=C_BOOL) :: expr__tmp 
    768849      LOGICAL, OPTIONAL, INTENT(OUT) :: field_ref_ 
    769850      LOGICAL(KIND=C_BOOL) :: field_ref__tmp 
    … …  
    821902      ENDIF 
    822903 
     904      IF (PRESENT(cell_methods_)) THEN 
     905        cell_methods__tmp = cxios_is_defined_fieldgroup_cell_methods & 
     906      (fieldgroup_hdl%daddr) 
     907        cell_methods_ = cell_methods__tmp 
     908      ENDIF 
     909 
     910      IF (PRESENT(cell_methods_mode_)) THEN 
     911        cell_methods_mode__tmp = cxios_is_defined_fieldgroup_cell_methods_mode & 
     912      (fieldgroup_hdl%daddr) 
     913        cell_methods_mode_ = cell_methods_mode__tmp 
     914      ENDIF 
     915 
    823916      IF (PRESENT(compression_level_)) THEN 
    824917        compression_level__tmp = cxios_is_defined_fieldgroup_compression_level & 
    … …  
    851944      ENDIF 
    852945 
     946      IF (PRESENT(expr_)) THEN 
     947        expr__tmp = cxios_is_defined_fieldgroup_expr & 
     948      (fieldgroup_hdl%daddr) 
     949        expr_ = expr__tmp 
     950      ENDIF 
     951 
    853952      IF (PRESENT(field_ref_)) THEN 
    854953        field_ref__tmp = cxios_is_defined_fieldgroup_field_ref & 
Note: See TracChangeset for help on using the changeset viewer.