Ignore:
Timestamp:
04/24/18 18:03:18 (6 years ago)
Author:
oabramkina
Message:

Updating fortran interface for attributes that have been recently introduced and the following filters:

duplicate_scalar_to_axis
reduce_axis_to_axis
reduce_scalar_to_scalar
reorder_domain
temporal_splitting.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • XIOS/dev/XIOS_DEV_CMIP6/src/interface/fortran_attr/ifield_attr.F90

    r1201 r1492  
    1212 
    1313  SUBROUTINE xios(set_field_attr)  & 
    14     ( field_id, add_offset, axis_ref, cell_methods, cell_methods_mode, check_if_active, compression_level  & 
    15     , default_value, detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op  & 
    16     , grid_path, grid_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     ) 
     14    ( field_id, add_offset, axis_ref, cell_methods, cell_methods_mode, check_if_active, comment  & 
     15    , compression_level, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref  & 
     16    , freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name, name, operation  & 
     17    , prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit  & 
     18    , valid_max, valid_min ) 
    1919 
    2020    IMPLICIT NONE 
    … …  
    2727      LOGICAL  , OPTIONAL, INTENT(IN) :: check_if_active 
    2828      LOGICAL (KIND=C_BOOL) :: check_if_active_tmp 
     29      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: comment 
    2930      INTEGER  , OPTIONAL, INTENT(IN) :: compression_level 
    3031      REAL (KIND=8) , OPTIONAL, INTENT(IN) :: default_value 
    … …  
    6263      (field_id,field_hdl) 
    6364      CALL xios(set_field_attr_hdl_)   & 
    64       ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, check_if_active, compression_level  & 
    65       , default_value, detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op  & 
    66       , grid_path, grid_ref, indexed_output, level, long_name, name, operation, prec, read_access  & 
    67       , scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min  & 
    68       ) 
     65      ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, check_if_active, comment  & 
     66      , compression_level, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref  & 
     67      , freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name, name, operation  & 
     68      , prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit  & 
     69      , valid_max, valid_min ) 
    6970 
    7071  END SUBROUTINE xios(set_field_attr) 
    7172 
    7273  SUBROUTINE xios(set_field_attr_hdl)  & 
    73     ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, check_if_active, compression_level  & 
    74     , default_value, detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op  & 
    75     , grid_path, grid_ref, indexed_output, level, long_name, name, operation, prec, read_access  & 
    76     , scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min  & 
    77     ) 
     74    ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, check_if_active, comment  & 
     75    , compression_level, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref  & 
     76    , freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name, name, operation  & 
     77    , prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit  & 
     78    , valid_max, valid_min ) 
    7879 
    7980    IMPLICIT NONE 
    … …  
    8586      LOGICAL  , OPTIONAL, INTENT(IN) :: check_if_active 
    8687      LOGICAL (KIND=C_BOOL) :: check_if_active_tmp 
     88      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: comment 
    8789      INTEGER  , OPTIONAL, INTENT(IN) :: compression_level 
    8890      REAL (KIND=8) , OPTIONAL, INTENT(IN) :: default_value 
    … …  
    118120 
    119121      CALL xios(set_field_attr_hdl_)  & 
    120       ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, check_if_active, compression_level  & 
    121       , default_value, detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op  & 
    122       , grid_path, grid_ref, indexed_output, level, long_name, name, operation, prec, read_access  & 
    123       , scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min  & 
    124       ) 
     122      ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, check_if_active, comment  & 
     123      , compression_level, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref  & 
     124      , freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name, name, operation  & 
     125      , prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit  & 
     126      , valid_max, valid_min ) 
    125127 
    126128  END SUBROUTINE xios(set_field_attr_hdl) 
    127129 
    128130  SUBROUTINE xios(set_field_attr_hdl_)   & 
    129     ( field_hdl, add_offset_, axis_ref_, cell_methods_, cell_methods_mode_, check_if_active_, compression_level_  & 
    130     , default_value_, detect_missing_value_, domain_ref_, enabled_, expr_, field_ref_, freq_offset_  & 
    131     , freq_op_, grid_path_, grid_ref_, indexed_output_, level_, long_name_, name_, operation_, prec_  & 
    132     , read_access_, scalar_ref_, scale_factor_, standard_name_, ts_enabled_, ts_split_freq_, unit_  & 
    133     , valid_max_, valid_min_ ) 
     131    ( field_hdl, add_offset_, axis_ref_, cell_methods_, cell_methods_mode_, check_if_active_, comment_  & 
     132    , compression_level_, default_value_, detect_missing_value_, domain_ref_, enabled_, expr_, field_ref_  & 
     133    , freq_offset_, freq_op_, grid_path_, grid_ref_, indexed_output_, level_, long_name_, name_  & 
     134    , operation_, prec_, read_access_, scalar_ref_, scale_factor_, standard_name_, ts_enabled_, ts_split_freq_  & 
     135    , unit_, valid_max_, valid_min_ ) 
    134136 
    135137    IMPLICIT NONE 
    … …  
    141143      LOGICAL  , OPTIONAL, INTENT(IN) :: check_if_active_ 
    142144      LOGICAL (KIND=C_BOOL) :: check_if_active__tmp 
     145      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: comment_ 
    143146      INTEGER  , OPTIONAL, INTENT(IN) :: compression_level_ 
    144147      REAL (KIND=8) , OPTIONAL, INTENT(IN) :: default_value_ 
    … …  
    199202      ENDIF 
    200203 
     204      IF (PRESENT(comment_)) THEN 
     205        CALL cxios_set_field_comment & 
     206      (field_hdl%daddr, comment_, len(comment_)) 
     207      ENDIF 
     208 
    201209      IF (PRESENT(compression_level_)) THEN 
    202210        CALL cxios_set_field_compression_level & 
    … …  
    337345 
    338346  SUBROUTINE xios(get_field_attr)  & 
    339     ( field_id, add_offset, axis_ref, cell_methods, cell_methods_mode, check_if_active, compression_level  & 
    340     , default_value, detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op  & 
    341     , grid_path, grid_ref, indexed_output, level, long_name, name, operation, prec, read_access  & 
    342     , scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min  & 
    343     ) 
     347    ( field_id, add_offset, axis_ref, cell_methods, cell_methods_mode, check_if_active, comment  & 
     348    , compression_level, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref  & 
     349    , freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name, name, operation  & 
     350    , prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit  & 
     351    , valid_max, valid_min ) 
    344352 
    345353    IMPLICIT NONE 
    … …  
    352360      LOGICAL  , OPTIONAL, INTENT(OUT) :: check_if_active 
    353361      LOGICAL (KIND=C_BOOL) :: check_if_active_tmp 
     362      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: comment 
    354363      INTEGER  , OPTIONAL, INTENT(OUT) :: compression_level 
    355364      REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: default_value 
    … …  
    387396      (field_id,field_hdl) 
    388397      CALL xios(get_field_attr_hdl_)   & 
    389       ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, check_if_active, compression_level  & 
    390       , default_value, detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op  & 
    391       , grid_path, grid_ref, indexed_output, level, long_name, name, operation, prec, read_access  & 
    392       , scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min  & 
    393       ) 
     398      ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, check_if_active, comment  & 
     399      , compression_level, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref  & 
     400      , freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name, name, operation  & 
     401      , prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit  & 
     402      , valid_max, valid_min ) 
    394403 
    395404  END SUBROUTINE xios(get_field_attr) 
    396405 
    397406  SUBROUTINE xios(get_field_attr_hdl)  & 
    398     ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, check_if_active, compression_level  & 
    399     , default_value, detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op  & 
    400     , grid_path, grid_ref, indexed_output, level, long_name, name, operation, prec, read_access  & 
    401     , scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min  & 
    402     ) 
     407    ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, check_if_active, comment  & 
     408    , compression_level, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref  & 
     409    , freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name, name, operation  & 
     410    , prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit  & 
     411    , valid_max, valid_min ) 
    403412 
    404413    IMPLICIT NONE 
    … …  
    410419      LOGICAL  , OPTIONAL, INTENT(OUT) :: check_if_active 
    411420      LOGICAL (KIND=C_BOOL) :: check_if_active_tmp 
     421      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: comment 
    412422      INTEGER  , OPTIONAL, INTENT(OUT) :: compression_level 
    413423      REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: default_value 
    … …  
    443453 
    444454      CALL xios(get_field_attr_hdl_)  & 
    445       ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, check_if_active, compression_level  & 
    446       , default_value, detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op  & 
    447       , grid_path, grid_ref, indexed_output, level, long_name, name, operation, prec, read_access  & 
    448       , scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min  & 
    449       ) 
     455      ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, check_if_active, comment  & 
     456      , compression_level, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref  & 
     457      , freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name, name, operation  & 
     458      , prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit  & 
     459      , valid_max, valid_min ) 
    450460 
    451461  END SUBROUTINE xios(get_field_attr_hdl) 
    452462 
    453463  SUBROUTINE xios(get_field_attr_hdl_)   & 
    454     ( field_hdl, add_offset_, axis_ref_, cell_methods_, cell_methods_mode_, check_if_active_, compression_level_  & 
    455     , default_value_, detect_missing_value_, domain_ref_, enabled_, expr_, field_ref_, freq_offset_  & 
    456     , freq_op_, grid_path_, grid_ref_, indexed_output_, level_, long_name_, name_, operation_, prec_  & 
    457     , read_access_, scalar_ref_, scale_factor_, standard_name_, ts_enabled_, ts_split_freq_, unit_  & 
    458     , valid_max_, valid_min_ ) 
     464    ( field_hdl, add_offset_, axis_ref_, cell_methods_, cell_methods_mode_, check_if_active_, comment_  & 
     465    , compression_level_, default_value_, detect_missing_value_, domain_ref_, enabled_, expr_, field_ref_  & 
     466    , freq_offset_, freq_op_, grid_path_, grid_ref_, indexed_output_, level_, long_name_, name_  & 
     467    , operation_, prec_, read_access_, scalar_ref_, scale_factor_, standard_name_, ts_enabled_, ts_split_freq_  & 
     468    , unit_, valid_max_, valid_min_ ) 
    459469 
    460470    IMPLICIT NONE 
    … …  
    466476      LOGICAL  , OPTIONAL, INTENT(OUT) :: check_if_active_ 
    467477      LOGICAL (KIND=C_BOOL) :: check_if_active__tmp 
     478      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: comment_ 
    468479      INTEGER  , OPTIONAL, INTENT(OUT) :: compression_level_ 
    469480      REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: default_value_ 
    … …  
    524535      ENDIF 
    525536 
     537      IF (PRESENT(comment_)) THEN 
     538        CALL cxios_get_field_comment & 
     539      (field_hdl%daddr, comment_, len(comment_)) 
     540      ENDIF 
     541 
    526542      IF (PRESENT(compression_level_)) THEN 
    527543        CALL cxios_get_field_compression_level & 
    … …  
    662678 
    663679  SUBROUTINE xios(is_defined_field_attr)  & 
    664     ( field_id, add_offset, axis_ref, cell_methods, cell_methods_mode, check_if_active, compression_level  & 
    665     , default_value, detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op  & 
    666     , grid_path, grid_ref, indexed_output, level, long_name, name, operation, prec, read_access  & 
    667     , scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min  & 
    668     ) 
     680    ( field_id, add_offset, axis_ref, cell_methods, cell_methods_mode, check_if_active, comment  & 
     681    , compression_level, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref  & 
     682    , freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name, name, operation  & 
     683    , prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit  & 
     684    , valid_max, valid_min ) 
    669685 
    670686    IMPLICIT NONE 
    … …  
    681697      LOGICAL, OPTIONAL, INTENT(OUT) :: check_if_active 
    682698      LOGICAL(KIND=C_BOOL) :: check_if_active_tmp 
     699      LOGICAL, OPTIONAL, INTENT(OUT) :: comment 
     700      LOGICAL(KIND=C_BOOL) :: comment_tmp 
    683701      LOGICAL, OPTIONAL, INTENT(OUT) :: compression_level 
    684702      LOGICAL(KIND=C_BOOL) :: compression_level_tmp 
    … …  
    737755      (field_id,field_hdl) 
    738756      CALL xios(is_defined_field_attr_hdl_)   & 
    739       ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, check_if_active, compression_level  & 
    740       , default_value, detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op  & 
    741       , grid_path, grid_ref, indexed_output, level, long_name, name, operation, prec, read_access  & 
    742       , scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min  & 
    743       ) 
     757      ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, check_if_active, comment  & 
     758      , compression_level, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref  & 
     759      , freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name, name, operation  & 
     760      , prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit  & 
     761      , valid_max, valid_min ) 
    744762 
    745763  END SUBROUTINE xios(is_defined_field_attr) 
    746764 
    747765  SUBROUTINE xios(is_defined_field_attr_hdl)  & 
    748     ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, check_if_active, compression_level  & 
    749     , default_value, detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op  & 
    750     , grid_path, grid_ref, indexed_output, level, long_name, name, operation, prec, read_access  & 
    751     , scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min  & 
    752     ) 
     766    ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, check_if_active, comment  & 
     767    , compression_level, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref  & 
     768    , freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name, name, operation  & 
     769    , prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit  & 
     770    , valid_max, valid_min ) 
    753771 
    754772    IMPLICIT NONE 
    … …  
    764782      LOGICAL, OPTIONAL, INTENT(OUT) :: check_if_active 
    765783      LOGICAL(KIND=C_BOOL) :: check_if_active_tmp 
     784      LOGICAL, OPTIONAL, INTENT(OUT) :: comment 
     785      LOGICAL(KIND=C_BOOL) :: comment_tmp 
    766786      LOGICAL, OPTIONAL, INTENT(OUT) :: compression_level 
    767787      LOGICAL(KIND=C_BOOL) :: compression_level_tmp 
    … …  
    818838 
    819839      CALL xios(is_defined_field_attr_hdl_)  & 
    820       ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, check_if_active, compression_level  & 
    821       , default_value, detect_missing_value, domain_ref, enabled, expr, field_ref, freq_offset, freq_op  & 
    822       , grid_path, grid_ref, indexed_output, level, long_name, name, operation, prec, read_access  & 
    823       , scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit, valid_max, valid_min  & 
    824       ) 
     840      ( field_hdl, add_offset, axis_ref, cell_methods, cell_methods_mode, check_if_active, comment  & 
     841      , compression_level, default_value, detect_missing_value, domain_ref, enabled, expr, field_ref  & 
     842      , freq_offset, freq_op, grid_path, grid_ref, indexed_output, level, long_name, name, operation  & 
     843      , prec, read_access, scalar_ref, scale_factor, standard_name, ts_enabled, ts_split_freq, unit  & 
     844      , valid_max, valid_min ) 
    825845 
    826846  END SUBROUTINE xios(is_defined_field_attr_hdl) 
    827847 
    828848  SUBROUTINE xios(is_defined_field_attr_hdl_)   & 
    829     ( field_hdl, add_offset_, axis_ref_, cell_methods_, cell_methods_mode_, check_if_active_, compression_level_  & 
    830     , default_value_, detect_missing_value_, domain_ref_, enabled_, expr_, field_ref_, freq_offset_  & 
    831     , freq_op_, grid_path_, grid_ref_, indexed_output_, level_, long_name_, name_, operation_, prec_  & 
    832     , read_access_, scalar_ref_, scale_factor_, standard_name_, ts_enabled_, ts_split_freq_, unit_  & 
    833     , valid_max_, valid_min_ ) 
     849    ( field_hdl, add_offset_, axis_ref_, cell_methods_, cell_methods_mode_, check_if_active_, comment_  & 
     850    , compression_level_, default_value_, detect_missing_value_, domain_ref_, enabled_, expr_, field_ref_  & 
     851    , freq_offset_, freq_op_, grid_path_, grid_ref_, indexed_output_, level_, long_name_, name_  & 
     852    , operation_, prec_, read_access_, scalar_ref_, scale_factor_, standard_name_, ts_enabled_, ts_split_freq_  & 
     853    , unit_, valid_max_, valid_min_ ) 
    834854 
    835855    IMPLICIT NONE 
    … …  
    845865      LOGICAL, OPTIONAL, INTENT(OUT) :: check_if_active_ 
    846866      LOGICAL(KIND=C_BOOL) :: check_if_active__tmp 
     867      LOGICAL, OPTIONAL, INTENT(OUT) :: comment_ 
     868      LOGICAL(KIND=C_BOOL) :: comment__tmp 
    847869      LOGICAL, OPTIONAL, INTENT(OUT) :: compression_level_ 
    848870      LOGICAL(KIND=C_BOOL) :: compression_level__tmp 
    … …  
    928950      ENDIF 
    929951 
     952      IF (PRESENT(comment_)) THEN 
     953        comment__tmp = cxios_is_defined_field_comment & 
     954      (field_hdl%daddr) 
     955        comment_ = comment__tmp 
     956      ENDIF 
     957 
    930958      IF (PRESENT(compression_level_)) THEN 
    931959        compression_level__tmp = cxios_is_defined_field_compression_level & 
Note: See TracChangeset for help on using the changeset viewer.