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/ifield_attr.F90

    r966 r1021  
    1212 
    1313  SUBROUTINE xios(set_field_attr)  & 
    14     ( field_id, add_offset, axis_ref, compression_level, default_value, detect_missing_value, domain_ref  & 
    15     , enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name  & 
    16     , name, operation, prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq  & 
    17     , unit, valid_max, valid_min ) 
     14    ( field_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, 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 ) 
    1818 
    1919    IMPLICIT NONE 
    … …  
    2222      REAL (KIND=8) , OPTIONAL, INTENT(IN) :: add_offset 
    2323      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref 
     24      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: cell_methods 
     25      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: cell_methods_mode 
    2426      INTEGER  , OPTIONAL, INTENT(IN) :: compression_level 
    2527      REAL (KIND=8) , OPTIONAL, INTENT(IN) :: default_value 
    … …  
    2931      LOGICAL  , OPTIONAL, INTENT(IN) :: enabled 
    3032      LOGICAL (KIND=C_BOOL) :: enabled_tmp 
     33      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: expr 
    3134      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: field_ref 
    3235      TYPE(txios(duration))  , OPTIONAL, INTENT(IN) :: freq_offset 
    … …  
    5659      (field_id,field_hdl) 
    5760      CALL xios(set_field_attr_hdl_)   & 
    58       ( field_hdl, add_offset, axis_ref, compression_level, default_value, detect_missing_value, domain_ref  & 
    59       , enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name  & 
    60       , name, operation, prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq  & 
    61       , unit, valid_max, valid_min ) 
     61      ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
     62      , detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op, grid_path  & 
     63      , grid_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 ) 
    6265 
    6366  END SUBROUTINE xios(set_field_attr) 
    6467 
    6568  SUBROUTINE xios(set_field_attr_hdl)  & 
    66     ( field_hdl, add_offset, axis_ref, compression_level, default_value, detect_missing_value, domain_ref  & 
    67     , enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name  & 
    68     , name, operation, prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq  & 
    69     , unit, valid_max, valid_min ) 
     69    ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
     70    , detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op, grid_path  & 
     71    , grid_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 ) 
    7073 
    7174    IMPLICIT NONE 
    … …  
    7376      REAL (KIND=8) , OPTIONAL, INTENT(IN) :: add_offset 
    7477      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref 
     78      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: cell_methods 
     79      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: cell_methods_mode 
    7580      INTEGER  , OPTIONAL, INTENT(IN) :: compression_level 
    7681      REAL (KIND=8) , OPTIONAL, INTENT(IN) :: default_value 
    … …  
    8085      LOGICAL  , OPTIONAL, INTENT(IN) :: enabled 
    8186      LOGICAL (KIND=C_BOOL) :: enabled_tmp 
     87      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: expr 
    8288      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: field_ref 
    8389      TYPE(txios(duration))  , OPTIONAL, INTENT(IN) :: freq_offset 
    … …  
    105111 
    106112      CALL xios(set_field_attr_hdl_)  & 
    107       ( field_hdl, add_offset, axis_ref, compression_level, default_value, detect_missing_value, domain_ref  & 
    108       , enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name  & 
    109       , name, operation, prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq  & 
    110       , unit, valid_max, valid_min ) 
     113      ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
     114      , detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op, grid_path  & 
     115      , grid_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 ) 
    111117 
    112118  END SUBROUTINE xios(set_field_attr_hdl) 
    113119 
    114120  SUBROUTINE xios(set_field_attr_hdl_)   & 
    115     ( field_hdl, add_offset_, axis_ref_, compression_level_, default_value_, detect_missing_value_  & 
    116     , domain_ref_, enabled_, field_ref_, freq_offset_, freq_op_, grid_path_, grid_ref_, indexed_output_  & 
    117     , level_, long_name_, name_, operation_, prec_, read_access_, scalar_ref_, scale_factor_, standard_name_  & 
    118     , ts_enabled_, ts_split_freq_, unit_, valid_max_, valid_min_ ) 
     121    ( field_hdl, add_offset_, axis_ref_, cell_methods_, cell_methods_mode_, compression_level_, default_value_  & 
     122    , detect_missing_value_, domain_ref_, enabled_, expr_, field_ref_, freq_offset_, freq_op_, grid_path_  & 
     123    , grid_ref_, indexed_output_, level_, long_name_, name_, operation_, prec_, read_access_, scalar_ref_  & 
     124    , scale_factor_, standard_name_, ts_enabled_, ts_split_freq_, unit_, valid_max_, valid_min_  & 
     125     ) 
    119126 
    120127    IMPLICIT NONE 
    … …  
    122129      REAL (KIND=8) , OPTIONAL, INTENT(IN) :: add_offset_ 
    123130      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref_ 
     131      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: cell_methods_ 
     132      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: cell_methods_mode_ 
    124133      INTEGER  , OPTIONAL, INTENT(IN) :: compression_level_ 
    125134      REAL (KIND=8) , OPTIONAL, INTENT(IN) :: default_value_ 
    … …  
    129138      LOGICAL  , OPTIONAL, INTENT(IN) :: enabled_ 
    130139      LOGICAL (KIND=C_BOOL) :: enabled__tmp 
     140      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: expr_ 
    131141      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: field_ref_ 
    132142      TYPE(txios(duration))  , OPTIONAL, INTENT(IN) :: freq_offset_ 
    … …  
    163173      ENDIF 
    164174 
     175      IF (PRESENT(cell_methods_)) THEN 
     176        CALL cxios_set_field_cell_methods & 
     177      (field_hdl%daddr, cell_methods_, len(cell_methods_)) 
     178      ENDIF 
     179 
     180      IF (PRESENT(cell_methods_mode_)) THEN 
     181        CALL cxios_set_field_cell_methods_mode & 
     182      (field_hdl%daddr, cell_methods_mode_, len(cell_methods_mode_)) 
     183      ENDIF 
     184 
    165185      IF (PRESENT(compression_level_)) THEN 
    166186        CALL cxios_set_field_compression_level & 
    … …  
    190210      ENDIF 
    191211 
     212      IF (PRESENT(expr_)) THEN 
     213        CALL cxios_set_field_expr & 
     214      (field_hdl%daddr, expr_, len(expr_)) 
     215      ENDIF 
     216 
    192217      IF (PRESENT(field_ref_)) THEN 
    193218        CALL cxios_set_field_field_ref & 
    … …  
    296321 
    297322  SUBROUTINE xios(get_field_attr)  & 
    298     ( field_id, add_offset, axis_ref, compression_level, default_value, detect_missing_value, domain_ref  & 
    299     , enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name  & 
    300     , name, operation, prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq  & 
    301     , unit, valid_max, valid_min ) 
     323    ( field_id, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
     324    , detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op, grid_path  & 
     325    , grid_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 ) 
    302327 
    303328    IMPLICIT NONE 
    … …  
    306331      REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: add_offset 
    307332      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref 
     333      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: cell_methods 
     334      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: cell_methods_mode 
    308335      INTEGER  , OPTIONAL, INTENT(OUT) :: compression_level 
    309336      REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: default_value 
    … …  
    313340      LOGICAL  , OPTIONAL, INTENT(OUT) :: enabled 
    314341      LOGICAL (KIND=C_BOOL) :: enabled_tmp 
     342      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: expr 
    315343      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: field_ref 
    316344      TYPE(txios(duration))  , OPTIONAL, INTENT(OUT) :: freq_offset 
    … …  
    340368      (field_id,field_hdl) 
    341369      CALL xios(get_field_attr_hdl_)   & 
    342       ( field_hdl, add_offset, axis_ref, compression_level, default_value, detect_missing_value, domain_ref  & 
    343       , enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name  & 
    344       , name, operation, prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq  & 
    345       , unit, valid_max, valid_min ) 
     370      ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
     371      , detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op, grid_path  & 
     372      , grid_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 ) 
    346374 
    347375  END SUBROUTINE xios(get_field_attr) 
    348376 
    349377  SUBROUTINE xios(get_field_attr_hdl)  & 
    350     ( field_hdl, add_offset, axis_ref, compression_level, default_value, detect_missing_value, domain_ref  & 
    351     , enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name  & 
    352     , name, operation, prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq  & 
    353     , unit, valid_max, valid_min ) 
     378    ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
     379    , detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op, grid_path  & 
     380    , grid_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 ) 
    354382 
    355383    IMPLICIT NONE 
    … …  
    357385      REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: add_offset 
    358386      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref 
     387      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: cell_methods 
     388      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: cell_methods_mode 
    359389      INTEGER  , OPTIONAL, INTENT(OUT) :: compression_level 
    360390      REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: default_value 
    … …  
    364394      LOGICAL  , OPTIONAL, INTENT(OUT) :: enabled 
    365395      LOGICAL (KIND=C_BOOL) :: enabled_tmp 
     396      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: expr 
    366397      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: field_ref 
    367398      TYPE(txios(duration))  , OPTIONAL, INTENT(OUT) :: freq_offset 
    … …  
    389420 
    390421      CALL xios(get_field_attr_hdl_)  & 
    391       ( field_hdl, add_offset, axis_ref, compression_level, default_value, detect_missing_value, domain_ref  & 
    392       , enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name  & 
    393       , name, operation, prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq  & 
    394       , unit, valid_max, valid_min ) 
     422      ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
     423      , detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op, grid_path  & 
     424      , grid_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 ) 
    395426 
    396427  END SUBROUTINE xios(get_field_attr_hdl) 
    397428 
    398429  SUBROUTINE xios(get_field_attr_hdl_)   & 
    399     ( field_hdl, add_offset_, axis_ref_, compression_level_, default_value_, detect_missing_value_  & 
    400     , domain_ref_, enabled_, field_ref_, freq_offset_, freq_op_, grid_path_, grid_ref_, indexed_output_  & 
    401     , level_, long_name_, name_, operation_, prec_, read_access_, scalar_ref_, scale_factor_, standard_name_  & 
    402     , ts_enabled_, ts_split_freq_, unit_, valid_max_, valid_min_ ) 
     430    ( field_hdl, add_offset_, axis_ref_, cell_methods_, cell_methods_mode_, compression_level_, default_value_  & 
     431    , detect_missing_value_, domain_ref_, enabled_, expr_, field_ref_, freq_offset_, freq_op_, grid_path_  & 
     432    , grid_ref_, indexed_output_, level_, long_name_, name_, operation_, prec_, read_access_, scalar_ref_  & 
     433    , scale_factor_, standard_name_, ts_enabled_, ts_split_freq_, unit_, valid_max_, valid_min_  & 
     434     ) 
    403435 
    404436    IMPLICIT NONE 
    … …  
    406438      REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: add_offset_ 
    407439      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref_ 
     440      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: cell_methods_ 
     441      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: cell_methods_mode_ 
    408442      INTEGER  , OPTIONAL, INTENT(OUT) :: compression_level_ 
    409443      REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: default_value_ 
    … …  
    413447      LOGICAL  , OPTIONAL, INTENT(OUT) :: enabled_ 
    414448      LOGICAL (KIND=C_BOOL) :: enabled__tmp 
     449      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: expr_ 
    415450      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: field_ref_ 
    416451      TYPE(txios(duration))  , OPTIONAL, INTENT(OUT) :: freq_offset_ 
    … …  
    447482      ENDIF 
    448483 
     484      IF (PRESENT(cell_methods_)) THEN 
     485        CALL cxios_get_field_cell_methods & 
     486      (field_hdl%daddr, cell_methods_, len(cell_methods_)) 
     487      ENDIF 
     488 
     489      IF (PRESENT(cell_methods_mode_)) THEN 
     490        CALL cxios_get_field_cell_methods_mode & 
     491      (field_hdl%daddr, cell_methods_mode_, len(cell_methods_mode_)) 
     492      ENDIF 
     493 
    449494      IF (PRESENT(compression_level_)) THEN 
    450495        CALL cxios_get_field_compression_level & 
    … …  
    474519      ENDIF 
    475520 
     521      IF (PRESENT(expr_)) THEN 
     522        CALL cxios_get_field_expr & 
     523      (field_hdl%daddr, expr_, len(expr_)) 
     524      ENDIF 
     525 
    476526      IF (PRESENT(field_ref_)) THEN 
    477527        CALL cxios_get_field_field_ref & 
    … …  
    580630 
    581631  SUBROUTINE xios(is_defined_field_attr)  & 
    582     ( field_id, add_offset, axis_ref, compression_level, default_value, detect_missing_value, domain_ref  & 
    583     , enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name  & 
    584     , name, operation, prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq  & 
    585     , unit, valid_max, valid_min ) 
     632    ( field_id, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
     633    , detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op, grid_path  & 
     634    , grid_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 ) 
    586636 
    587637    IMPLICIT NONE 
    … …  
    592642      LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref 
    593643      LOGICAL(KIND=C_BOOL) :: axis_ref_tmp 
     644      LOGICAL, OPTIONAL, INTENT(OUT) :: cell_methods 
     645      LOGICAL(KIND=C_BOOL) :: cell_methods_tmp 
     646      LOGICAL, OPTIONAL, INTENT(OUT) :: cell_methods_mode 
     647      LOGICAL(KIND=C_BOOL) :: cell_methods_mode_tmp 
    594648      LOGICAL, OPTIONAL, INTENT(OUT) :: compression_level 
    595649      LOGICAL(KIND=C_BOOL) :: compression_level_tmp 
    … …  
    602656      LOGICAL, OPTIONAL, INTENT(OUT) :: enabled 
    603657      LOGICAL(KIND=C_BOOL) :: enabled_tmp 
     658      LOGICAL, OPTIONAL, INTENT(OUT) :: expr 
     659      LOGICAL(KIND=C_BOOL) :: expr_tmp 
    604660      LOGICAL, OPTIONAL, INTENT(OUT) :: field_ref 
    605661      LOGICAL(KIND=C_BOOL) :: field_ref_tmp 
    … …  
    646702      (field_id,field_hdl) 
    647703      CALL xios(is_defined_field_attr_hdl_)   & 
    648       ( field_hdl, add_offset, axis_ref, compression_level, default_value, detect_missing_value, domain_ref  & 
    649       , enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name  & 
    650       , name, operation, prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq  & 
    651       , unit, valid_max, valid_min ) 
     704      ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
     705      , detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op, grid_path  & 
     706      , grid_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 ) 
    652708 
    653709  END SUBROUTINE xios(is_defined_field_attr) 
    654710 
    655711  SUBROUTINE xios(is_defined_field_attr_hdl)  & 
    656     ( field_hdl, add_offset, axis_ref, compression_level, default_value, detect_missing_value, domain_ref  & 
    657     , enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name  & 
    658     , name, operation, prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq  & 
    659     , unit, valid_max, valid_min ) 
     712    ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
     713    , detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op, grid_path  & 
     714    , grid_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 ) 
    660716 
    661717    IMPLICIT NONE 
    … …  
    665721      LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref 
    666722      LOGICAL(KIND=C_BOOL) :: axis_ref_tmp 
     723      LOGICAL, OPTIONAL, INTENT(OUT) :: cell_methods 
     724      LOGICAL(KIND=C_BOOL) :: cell_methods_tmp 
     725      LOGICAL, OPTIONAL, INTENT(OUT) :: cell_methods_mode 
     726      LOGICAL(KIND=C_BOOL) :: cell_methods_mode_tmp 
    667727      LOGICAL, OPTIONAL, INTENT(OUT) :: compression_level 
    668728      LOGICAL(KIND=C_BOOL) :: compression_level_tmp 
    … …  
    675735      LOGICAL, OPTIONAL, INTENT(OUT) :: enabled 
    676736      LOGICAL(KIND=C_BOOL) :: enabled_tmp 
     737      LOGICAL, OPTIONAL, INTENT(OUT) :: expr 
     738      LOGICAL(KIND=C_BOOL) :: expr_tmp 
    677739      LOGICAL, OPTIONAL, INTENT(OUT) :: field_ref 
    678740      LOGICAL(KIND=C_BOOL) :: field_ref_tmp 
    … …  
    717779 
    718780      CALL xios(is_defined_field_attr_hdl_)  & 
    719       ( field_hdl, add_offset, axis_ref, compression_level, default_value, detect_missing_value, domain_ref  & 
    720       , enabled, field_ref, freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name  & 
    721       , name, operation, prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq  & 
    722       , unit, valid_max, valid_min ) 
     781      ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, compression_level, default_value  & 
     782      , detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op, grid_path  & 
     783      , grid_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 ) 
    723785 
    724786  END SUBROUTINE xios(is_defined_field_attr_hdl) 
    725787 
    726788  SUBROUTINE xios(is_defined_field_attr_hdl_)   & 
    727     ( field_hdl, add_offset_, axis_ref_, compression_level_, default_value_, detect_missing_value_  & 
    728     , domain_ref_, enabled_, field_ref_, freq_offset_, freq_op_, grid_path_, grid_ref_, indexed_output_  & 
    729     , level_, long_name_, name_, operation_, prec_, read_access_, scalar_ref_, scale_factor_, standard_name_  & 
    730     , ts_enabled_, ts_split_freq_, unit_, valid_max_, valid_min_ ) 
     789    ( field_hdl, add_offset_, axis_ref_, cell_methods_, cell_methods_mode_, compression_level_, default_value_  & 
     790    , detect_missing_value_, domain_ref_, enabled_, expr_, field_ref_, freq_offset_, freq_op_, grid_path_  & 
     791    , grid_ref_, indexed_output_, level_, long_name_, name_, operation_, prec_, read_access_, scalar_ref_  & 
     792    , scale_factor_, standard_name_, ts_enabled_, ts_split_freq_, unit_, valid_max_, valid_min_  & 
     793     ) 
    731794 
    732795    IMPLICIT NONE 
    … …  
    736799      LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref_ 
    737800      LOGICAL(KIND=C_BOOL) :: axis_ref__tmp 
     801      LOGICAL, OPTIONAL, INTENT(OUT) :: cell_methods_ 
     802      LOGICAL(KIND=C_BOOL) :: cell_methods__tmp 
     803      LOGICAL, OPTIONAL, INTENT(OUT) :: cell_methods_mode_ 
     804      LOGICAL(KIND=C_BOOL) :: cell_methods_mode__tmp 
    738805      LOGICAL, OPTIONAL, INTENT(OUT) :: compression_level_ 
    739806      LOGICAL(KIND=C_BOOL) :: compression_level__tmp 
    … …  
    746813      LOGICAL, OPTIONAL, INTENT(OUT) :: enabled_ 
    747814      LOGICAL(KIND=C_BOOL) :: enabled__tmp 
     815      LOGICAL, OPTIONAL, INTENT(OUT) :: expr_ 
     816      LOGICAL(KIND=C_BOOL) :: expr__tmp 
    748817      LOGICAL, OPTIONAL, INTENT(OUT) :: field_ref_ 
    749818      LOGICAL(KIND=C_BOOL) :: field_ref__tmp 
    … …  
    799868      ENDIF 
    800869 
     870      IF (PRESENT(cell_methods_)) THEN 
     871        cell_methods__tmp = cxios_is_defined_field_cell_methods & 
     872      (field_hdl%daddr) 
     873        cell_methods_ = cell_methods__tmp 
     874      ENDIF 
     875 
     876      IF (PRESENT(cell_methods_mode_)) THEN 
     877        cell_methods_mode__tmp = cxios_is_defined_field_cell_methods_mode & 
     878      (field_hdl%daddr) 
     879        cell_methods_mode_ = cell_methods_mode__tmp 
     880      ENDIF 
     881 
    801882      IF (PRESENT(compression_level_)) THEN 
    802883        compression_level__tmp = cxios_is_defined_field_compression_level & 
    … …  
    829910      ENDIF 
    830911 
     912      IF (PRESENT(expr_)) THEN 
     913        expr__tmp = cxios_is_defined_field_expr & 
     914      (field_hdl%daddr) 
     915        expr_ = expr__tmp 
     916      ENDIF 
     917 
    831918      IF (PRESENT(field_ref_)) THEN 
    832919        field_ref__tmp = cxios_is_defined_field_field_ref & 
Note: See TracChangeset for help on using the changeset viewer.