Ignore:
Timestamp:
06/18/18 20:32:55 (6 years ago)
Author:
yushan
Message:

branch_openmp merged with trunk r1544

File:
1 edited

Legend:

Unmodified
Added
Removed

  • XIOS/dev/branch_openmp/src/interface/fortran_attr/iaxis_attr.F90

    r1052 r1545  
    1212 
    1313  SUBROUTINE xios(set_axis_attr)  & 
    14     ( axis_id, axis_ref, begin, bounds, data_begin, data_index, data_n, index, label, long_name  & 
    15     , mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit, value  & 
    16      ) 
     14    ( axis_id, axis_ref, axis_type, begin, bounds, bounds_name, comment, data_begin, data_index  & 
     15    , data_n, dim_name, formula, formula_bounds, formula_term, formula_term_bounds, index, label  & 
     16    , long_name, mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit  & 
     17    , value ) 
    1718 
    1819    IMPLICIT NONE 
    … …  
    2021      CHARACTER(LEN=*), INTENT(IN) ::axis_id 
    2122      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref 
     23      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_type 
    2224      INTEGER  , OPTIONAL, INTENT(IN) :: begin 
    2325      REAL (KIND=8) , OPTIONAL, INTENT(IN) :: bounds(:,:) 
     26      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: bounds_name 
     27      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: comment 
    2428      INTEGER  , OPTIONAL, INTENT(IN) :: data_begin 
    2529      INTEGER  , OPTIONAL, INTENT(IN) :: data_index(:) 
    2630      INTEGER  , OPTIONAL, INTENT(IN) :: data_n 
     31      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: dim_name 
     32      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: formula 
     33      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: formula_bounds 
     34      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: formula_term 
     35      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: formula_term_bounds 
    2736      INTEGER  , OPTIONAL, INTENT(IN) :: index(:) 
    2837      CHARACTER(len=*) , OPTIONAL, INTENT(IN) :: label(:) 
    … …  
    4352      (axis_id,axis_hdl) 
    4453      CALL xios(set_axis_attr_hdl_)   & 
    45       ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, label, long_name  & 
    46       , mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit, value  & 
    47        ) 
     54      ( axis_hdl, axis_ref, axis_type, begin, bounds, bounds_name, comment, data_begin, data_index  & 
     55      , data_n, dim_name, formula, formula_bounds, formula_term, formula_term_bounds, index, label  & 
     56      , long_name, mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit  & 
     57      , value ) 
    4858 
    4959  END SUBROUTINE xios(set_axis_attr) 
    5060 
    5161  SUBROUTINE xios(set_axis_attr_hdl)  & 
    52     ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, label, long_name  & 
    53     , mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit, value  & 
    54      ) 
     62    ( axis_hdl, axis_ref, axis_type, begin, bounds, bounds_name, comment, data_begin, data_index  & 
     63    , data_n, dim_name, formula, formula_bounds, formula_term, formula_term_bounds, index, label  & 
     64    , long_name, mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit  & 
     65    , value ) 
    5566 
    5667    IMPLICIT NONE 
    5768      TYPE(txios(axis)) , INTENT(IN) :: axis_hdl 
    5869      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref 
     70      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_type 
    5971      INTEGER  , OPTIONAL, INTENT(IN) :: begin 
    6072      REAL (KIND=8) , OPTIONAL, INTENT(IN) :: bounds(:,:) 
     73      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: bounds_name 
     74      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: comment 
    6175      INTEGER  , OPTIONAL, INTENT(IN) :: data_begin 
    6276      INTEGER  , OPTIONAL, INTENT(IN) :: data_index(:) 
    6377      INTEGER  , OPTIONAL, INTENT(IN) :: data_n 
     78      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: dim_name 
     79      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: formula 
     80      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: formula_bounds 
     81      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: formula_term 
     82      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: formula_term_bounds 
    6483      INTEGER  , OPTIONAL, INTENT(IN) :: index(:) 
    6584      CHARACTER(len=*) , OPTIONAL, INTENT(IN) :: label(:) 
    … …  
    7897 
    7998      CALL xios(set_axis_attr_hdl_)  & 
    80       ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, label, long_name  & 
    81       , mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit, value  & 
    82        ) 
     99      ( axis_hdl, axis_ref, axis_type, begin, bounds, bounds_name, comment, data_begin, data_index  & 
     100      , data_n, dim_name, formula, formula_bounds, formula_term, formula_term_bounds, index, label  & 
     101      , long_name, mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit  & 
     102      , value ) 
    83103 
    84104  END SUBROUTINE xios(set_axis_attr_hdl) 
    85105 
    86106  SUBROUTINE xios(set_axis_attr_hdl_)   & 
    87     ( axis_hdl, axis_ref_, begin_, bounds_, data_begin_, data_index_, data_n_, index_, label_, long_name_  & 
    88     , mask_, n_, n_distributed_partition_, n_glo_, name_, positive_, prec_, standard_name_, unit_  & 
    89     , value_ ) 
     107    ( axis_hdl, axis_ref_, axis_type_, begin_, bounds_, bounds_name_, comment_, data_begin_, data_index_  & 
     108    , data_n_, dim_name_, formula_, formula_bounds_, formula_term_, formula_term_bounds_, index_  & 
     109    , label_, long_name_, mask_, n_, n_distributed_partition_, n_glo_, name_, positive_, prec_, standard_name_  & 
     110    , unit_, value_ ) 
    90111 
    91112    IMPLICIT NONE 
    92113      TYPE(txios(axis)) , INTENT(IN) :: axis_hdl 
    93114      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref_ 
     115      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_type_ 
    94116      INTEGER  , OPTIONAL, INTENT(IN) :: begin_ 
    95117      REAL (KIND=8) , OPTIONAL, INTENT(IN) :: bounds_(:,:) 
     118      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: bounds_name_ 
     119      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: comment_ 
    96120      INTEGER  , OPTIONAL, INTENT(IN) :: data_begin_ 
    97121      INTEGER  , OPTIONAL, INTENT(IN) :: data_index_(:) 
    98122      INTEGER  , OPTIONAL, INTENT(IN) :: data_n_ 
     123      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: dim_name_ 
     124      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: formula_ 
     125      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: formula_bounds_ 
     126      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: formula_term_ 
     127      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: formula_term_bounds_ 
    99128      INTEGER  , OPTIONAL, INTENT(IN) :: index_(:) 
    100129      CHARACTER(len=*) , OPTIONAL, INTENT(IN) :: label_(:) 
    … …  
    117146      ENDIF 
    118147 
     148      IF (PRESENT(axis_type_)) THEN 
     149        CALL cxios_set_axis_axis_type & 
     150      (axis_hdl%daddr, axis_type_, len(axis_type_)) 
     151      ENDIF 
     152 
    119153      IF (PRESENT(begin_)) THEN 
    120154        CALL cxios_set_axis_begin & 
    … …  
    127161      ENDIF 
    128162 
     163      IF (PRESENT(bounds_name_)) THEN 
     164        CALL cxios_set_axis_bounds_name & 
     165      (axis_hdl%daddr, bounds_name_, len(bounds_name_)) 
     166      ENDIF 
     167 
     168      IF (PRESENT(comment_)) THEN 
     169        CALL cxios_set_axis_comment & 
     170      (axis_hdl%daddr, comment_, len(comment_)) 
     171      ENDIF 
     172 
    129173      IF (PRESENT(data_begin_)) THEN 
    130174        CALL cxios_set_axis_data_begin & 
    … …  
    140184        CALL cxios_set_axis_data_n & 
    141185      (axis_hdl%daddr, data_n_) 
     186      ENDIF 
     187 
     188      IF (PRESENT(dim_name_)) THEN 
     189        CALL cxios_set_axis_dim_name & 
     190      (axis_hdl%daddr, dim_name_, len(dim_name_)) 
     191      ENDIF 
     192 
     193      IF (PRESENT(formula_)) THEN 
     194        CALL cxios_set_axis_formula & 
     195      (axis_hdl%daddr, formula_, len(formula_)) 
     196      ENDIF 
     197 
     198      IF (PRESENT(formula_bounds_)) THEN 
     199        CALL cxios_set_axis_formula_bounds & 
     200      (axis_hdl%daddr, formula_bounds_, len(formula_bounds_)) 
     201      ENDIF 
     202 
     203      IF (PRESENT(formula_term_)) THEN 
     204        CALL cxios_set_axis_formula_term & 
     205      (axis_hdl%daddr, formula_term_, len(formula_term_)) 
     206      ENDIF 
     207 
     208      IF (PRESENT(formula_term_bounds_)) THEN 
     209        CALL cxios_set_axis_formula_term_bounds & 
     210      (axis_hdl%daddr, formula_term_bounds_, len(formula_term_bounds_)) 
    142211      ENDIF 
    143212 
    … …  
    212281 
    213282  SUBROUTINE xios(get_axis_attr)  & 
    214     ( axis_id, axis_ref, begin, bounds, data_begin, data_index, data_n, index, label, long_name  & 
    215     , mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit, value  & 
    216      ) 
     283    ( axis_id, axis_ref, axis_type, begin, bounds, bounds_name, comment, data_begin, data_index  & 
     284    , data_n, dim_name, formula, formula_bounds, formula_term, formula_term_bounds, index, label  & 
     285    , long_name, mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit  & 
     286    , value ) 
    217287 
    218288    IMPLICIT NONE 
    … …  
    220290      CHARACTER(LEN=*), INTENT(IN) ::axis_id 
    221291      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref 
     292      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_type 
    222293      INTEGER  , OPTIONAL, INTENT(OUT) :: begin 
    223294      REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: bounds(:,:) 
     295      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: bounds_name 
     296      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: comment 
    224297      INTEGER  , OPTIONAL, INTENT(OUT) :: data_begin 
    225298      INTEGER  , OPTIONAL, INTENT(OUT) :: data_index(:) 
    226299      INTEGER  , OPTIONAL, INTENT(OUT) :: data_n 
     300      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: dim_name 
     301      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: formula 
     302      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: formula_bounds 
     303      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: formula_term 
     304      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: formula_term_bounds 
    227305      INTEGER  , OPTIONAL, INTENT(OUT) :: index(:) 
    228306      CHARACTER(len=*) , OPTIONAL, INTENT(OUT) :: label(:) 
    … …  
    243321      (axis_id,axis_hdl) 
    244322      CALL xios(get_axis_attr_hdl_)   & 
    245       ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, label, long_name  & 
    246       , mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit, value  & 
    247        ) 
     323      ( axis_hdl, axis_ref, axis_type, begin, bounds, bounds_name, comment, data_begin, data_index  & 
     324      , data_n, dim_name, formula, formula_bounds, formula_term, formula_term_bounds, index, label  & 
     325      , long_name, mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit  & 
     326      , value ) 
    248327 
    249328  END SUBROUTINE xios(get_axis_attr) 
    250329 
    251330  SUBROUTINE xios(get_axis_attr_hdl)  & 
    252     ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, label, long_name  & 
    253     , mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit, value  & 
    254      ) 
     331    ( axis_hdl, axis_ref, axis_type, begin, bounds, bounds_name, comment, data_begin, data_index  & 
     332    , data_n, dim_name, formula, formula_bounds, formula_term, formula_term_bounds, index, label  & 
     333    , long_name, mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit  & 
     334    , value ) 
    255335 
    256336    IMPLICIT NONE 
    257337      TYPE(txios(axis)) , INTENT(IN) :: axis_hdl 
    258338      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref 
     339      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_type 
    259340      INTEGER  , OPTIONAL, INTENT(OUT) :: begin 
    260341      REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: bounds(:,:) 
     342      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: bounds_name 
     343      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: comment 
    261344      INTEGER  , OPTIONAL, INTENT(OUT) :: data_begin 
    262345      INTEGER  , OPTIONAL, INTENT(OUT) :: data_index(:) 
    263346      INTEGER  , OPTIONAL, INTENT(OUT) :: data_n 
     347      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: dim_name 
     348      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: formula 
     349      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: formula_bounds 
     350      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: formula_term 
     351      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: formula_term_bounds 
    264352      INTEGER  , OPTIONAL, INTENT(OUT) :: index(:) 
    265353      CHARACTER(len=*) , OPTIONAL, INTENT(OUT) :: label(:) 
    … …  
    278366 
    279367      CALL xios(get_axis_attr_hdl_)  & 
    280       ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, label, long_name  & 
    281       , mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit, value  & 
    282        ) 
     368      ( axis_hdl, axis_ref, axis_type, begin, bounds, bounds_name, comment, data_begin, data_index  & 
     369      , data_n, dim_name, formula, formula_bounds, formula_term, formula_term_bounds, index, label  & 
     370      , long_name, mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit  & 
     371      , value ) 
    283372 
    284373  END SUBROUTINE xios(get_axis_attr_hdl) 
    285374 
    286375  SUBROUTINE xios(get_axis_attr_hdl_)   & 
    287     ( axis_hdl, axis_ref_, begin_, bounds_, data_begin_, data_index_, data_n_, index_, label_, long_name_  & 
    288     , mask_, n_, n_distributed_partition_, n_glo_, name_, positive_, prec_, standard_name_, unit_  & 
    289     , value_ ) 
     376    ( axis_hdl, axis_ref_, axis_type_, begin_, bounds_, bounds_name_, comment_, data_begin_, data_index_  & 
     377    , data_n_, dim_name_, formula_, formula_bounds_, formula_term_, formula_term_bounds_, index_  & 
     378    , label_, long_name_, mask_, n_, n_distributed_partition_, n_glo_, name_, positive_, prec_, standard_name_  & 
     379    , unit_, value_ ) 
    290380 
    291381    IMPLICIT NONE 
    292382      TYPE(txios(axis)) , INTENT(IN) :: axis_hdl 
    293383      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref_ 
     384      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_type_ 
    294385      INTEGER  , OPTIONAL, INTENT(OUT) :: begin_ 
    295386      REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: bounds_(:,:) 
     387      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: bounds_name_ 
     388      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: comment_ 
    296389      INTEGER  , OPTIONAL, INTENT(OUT) :: data_begin_ 
    297390      INTEGER  , OPTIONAL, INTENT(OUT) :: data_index_(:) 
    298391      INTEGER  , OPTIONAL, INTENT(OUT) :: data_n_ 
     392      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: dim_name_ 
     393      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: formula_ 
     394      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: formula_bounds_ 
     395      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: formula_term_ 
     396      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: formula_term_bounds_ 
    299397      INTEGER  , OPTIONAL, INTENT(OUT) :: index_(:) 
    300398      CHARACTER(len=*) , OPTIONAL, INTENT(OUT) :: label_(:) 
    … …  
    317415      ENDIF 
    318416 
     417      IF (PRESENT(axis_type_)) THEN 
     418        CALL cxios_get_axis_axis_type & 
     419      (axis_hdl%daddr, axis_type_, len(axis_type_)) 
     420      ENDIF 
     421 
    319422      IF (PRESENT(begin_)) THEN 
    320423        CALL cxios_get_axis_begin & 
    … …  
    327430      ENDIF 
    328431 
     432      IF (PRESENT(bounds_name_)) THEN 
     433        CALL cxios_get_axis_bounds_name & 
     434      (axis_hdl%daddr, bounds_name_, len(bounds_name_)) 
     435      ENDIF 
     436 
     437      IF (PRESENT(comment_)) THEN 
     438        CALL cxios_get_axis_comment & 
     439      (axis_hdl%daddr, comment_, len(comment_)) 
     440      ENDIF 
     441 
    329442      IF (PRESENT(data_begin_)) THEN 
    330443        CALL cxios_get_axis_data_begin & 
    … …  
    340453        CALL cxios_get_axis_data_n & 
    341454      (axis_hdl%daddr, data_n_) 
     455      ENDIF 
     456 
     457      IF (PRESENT(dim_name_)) THEN 
     458        CALL cxios_get_axis_dim_name & 
     459      (axis_hdl%daddr, dim_name_, len(dim_name_)) 
     460      ENDIF 
     461 
     462      IF (PRESENT(formula_)) THEN 
     463        CALL cxios_get_axis_formula & 
     464      (axis_hdl%daddr, formula_, len(formula_)) 
     465      ENDIF 
     466 
     467      IF (PRESENT(formula_bounds_)) THEN 
     468        CALL cxios_get_axis_formula_bounds & 
     469      (axis_hdl%daddr, formula_bounds_, len(formula_bounds_)) 
     470      ENDIF 
     471 
     472      IF (PRESENT(formula_term_)) THEN 
     473        CALL cxios_get_axis_formula_term & 
     474      (axis_hdl%daddr, formula_term_, len(formula_term_)) 
     475      ENDIF 
     476 
     477      IF (PRESENT(formula_term_bounds_)) THEN 
     478        CALL cxios_get_axis_formula_term_bounds & 
     479      (axis_hdl%daddr, formula_term_bounds_, len(formula_term_bounds_)) 
    342480      ENDIF 
    343481 
    … …  
    412550 
    413551  SUBROUTINE xios(is_defined_axis_attr)  & 
    414     ( axis_id, axis_ref, begin, bounds, data_begin, data_index, data_n, index, label, long_name  & 
    415     , mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit, value  & 
    416      ) 
     552    ( axis_id, axis_ref, axis_type, begin, bounds, bounds_name, comment, data_begin, data_index  & 
     553    , data_n, dim_name, formula, formula_bounds, formula_term, formula_term_bounds, index, label  & 
     554    , long_name, mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit  & 
     555    , value ) 
    417556 
    418557    IMPLICIT NONE 
    … …  
    421560      LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref 
    422561      LOGICAL(KIND=C_BOOL) :: axis_ref_tmp 
     562      LOGICAL, OPTIONAL, INTENT(OUT) :: axis_type 
     563      LOGICAL(KIND=C_BOOL) :: axis_type_tmp 
    423564      LOGICAL, OPTIONAL, INTENT(OUT) :: begin 
    424565      LOGICAL(KIND=C_BOOL) :: begin_tmp 
    425566      LOGICAL, OPTIONAL, INTENT(OUT) :: bounds 
    426567      LOGICAL(KIND=C_BOOL) :: bounds_tmp 
     568      LOGICAL, OPTIONAL, INTENT(OUT) :: bounds_name 
     569      LOGICAL(KIND=C_BOOL) :: bounds_name_tmp 
     570      LOGICAL, OPTIONAL, INTENT(OUT) :: comment 
     571      LOGICAL(KIND=C_BOOL) :: comment_tmp 
    427572      LOGICAL, OPTIONAL, INTENT(OUT) :: data_begin 
    428573      LOGICAL(KIND=C_BOOL) :: data_begin_tmp 
    … …  
    431576      LOGICAL, OPTIONAL, INTENT(OUT) :: data_n 
    432577      LOGICAL(KIND=C_BOOL) :: data_n_tmp 
     578      LOGICAL, OPTIONAL, INTENT(OUT) :: dim_name 
     579      LOGICAL(KIND=C_BOOL) :: dim_name_tmp 
     580      LOGICAL, OPTIONAL, INTENT(OUT) :: formula 
     581      LOGICAL(KIND=C_BOOL) :: formula_tmp 
     582      LOGICAL, OPTIONAL, INTENT(OUT) :: formula_bounds 
     583      LOGICAL(KIND=C_BOOL) :: formula_bounds_tmp 
     584      LOGICAL, OPTIONAL, INTENT(OUT) :: formula_term 
     585      LOGICAL(KIND=C_BOOL) :: formula_term_tmp 
     586      LOGICAL, OPTIONAL, INTENT(OUT) :: formula_term_bounds 
     587      LOGICAL(KIND=C_BOOL) :: formula_term_bounds_tmp 
    433588      LOGICAL, OPTIONAL, INTENT(OUT) :: index 
    434589      LOGICAL(KIND=C_BOOL) :: index_tmp 
    … …  
    461616      (axis_id,axis_hdl) 
    462617      CALL xios(is_defined_axis_attr_hdl_)   & 
    463       ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, label, long_name  & 
    464       , mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit, value  & 
    465        ) 
     618      ( axis_hdl, axis_ref, axis_type, begin, bounds, bounds_name, comment, data_begin, data_index  & 
     619      , data_n, dim_name, formula, formula_bounds, formula_term, formula_term_bounds, index, label  & 
     620      , long_name, mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit  & 
     621      , value ) 
    466622 
    467623  END SUBROUTINE xios(is_defined_axis_attr) 
    468624 
    469625  SUBROUTINE xios(is_defined_axis_attr_hdl)  & 
    470     ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, label, long_name  & 
    471     , mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit, value  & 
    472      ) 
     626    ( axis_hdl, axis_ref, axis_type, begin, bounds, bounds_name, comment, data_begin, data_index  & 
     627    , data_n, dim_name, formula, formula_bounds, formula_term, formula_term_bounds, index, label  & 
     628    , long_name, mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit  & 
     629    , value ) 
    473630 
    474631    IMPLICIT NONE 
    … …  
    476633      LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref 
    477634      LOGICAL(KIND=C_BOOL) :: axis_ref_tmp 
     635      LOGICAL, OPTIONAL, INTENT(OUT) :: axis_type 
     636      LOGICAL(KIND=C_BOOL) :: axis_type_tmp 
    478637      LOGICAL, OPTIONAL, INTENT(OUT) :: begin 
    479638      LOGICAL(KIND=C_BOOL) :: begin_tmp 
    480639      LOGICAL, OPTIONAL, INTENT(OUT) :: bounds 
    481640      LOGICAL(KIND=C_BOOL) :: bounds_tmp 
     641      LOGICAL, OPTIONAL, INTENT(OUT) :: bounds_name 
     642      LOGICAL(KIND=C_BOOL) :: bounds_name_tmp 
     643      LOGICAL, OPTIONAL, INTENT(OUT) :: comment 
     644      LOGICAL(KIND=C_BOOL) :: comment_tmp 
    482645      LOGICAL, OPTIONAL, INTENT(OUT) :: data_begin 
    483646      LOGICAL(KIND=C_BOOL) :: data_begin_tmp 
    … …  
    486649      LOGICAL, OPTIONAL, INTENT(OUT) :: data_n 
    487650      LOGICAL(KIND=C_BOOL) :: data_n_tmp 
     651      LOGICAL, OPTIONAL, INTENT(OUT) :: dim_name 
     652      LOGICAL(KIND=C_BOOL) :: dim_name_tmp 
     653      LOGICAL, OPTIONAL, INTENT(OUT) :: formula 
     654      LOGICAL(KIND=C_BOOL) :: formula_tmp 
     655      LOGICAL, OPTIONAL, INTENT(OUT) :: formula_bounds 
     656      LOGICAL(KIND=C_BOOL) :: formula_bounds_tmp 
     657      LOGICAL, OPTIONAL, INTENT(OUT) :: formula_term 
     658      LOGICAL(KIND=C_BOOL) :: formula_term_tmp 
     659      LOGICAL, OPTIONAL, INTENT(OUT) :: formula_term_bounds 
     660      LOGICAL(KIND=C_BOOL) :: formula_term_bounds_tmp 
    488661      LOGICAL, OPTIONAL, INTENT(OUT) :: index 
    489662      LOGICAL(KIND=C_BOOL) :: index_tmp 
    … …  
    514687 
    515688      CALL xios(is_defined_axis_attr_hdl_)  & 
    516       ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, index, label, long_name  & 
    517       , mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit, value  & 
    518        ) 
     689      ( axis_hdl, axis_ref, axis_type, begin, bounds, bounds_name, comment, data_begin, data_index  & 
     690      , data_n, dim_name, formula, formula_bounds, formula_term, formula_term_bounds, index, label  & 
     691      , long_name, mask, n, n_distributed_partition, n_glo, name, positive, prec, standard_name, unit  & 
     692      , value ) 
    519693 
    520694  END SUBROUTINE xios(is_defined_axis_attr_hdl) 
    521695 
    522696  SUBROUTINE xios(is_defined_axis_attr_hdl_)   & 
    523     ( axis_hdl, axis_ref_, begin_, bounds_, data_begin_, data_index_, data_n_, index_, label_, long_name_  & 
    524     , mask_, n_, n_distributed_partition_, n_glo_, name_, positive_, prec_, standard_name_, unit_  & 
    525     , value_ ) 
     697    ( axis_hdl, axis_ref_, axis_type_, begin_, bounds_, bounds_name_, comment_, data_begin_, data_index_  & 
     698    , data_n_, dim_name_, formula_, formula_bounds_, formula_term_, formula_term_bounds_, index_  & 
     699    , label_, long_name_, mask_, n_, n_distributed_partition_, n_glo_, name_, positive_, prec_, standard_name_  & 
     700    , unit_, value_ ) 
    526701 
    527702    IMPLICIT NONE 
    … …  
    529704      LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref_ 
    530705      LOGICAL(KIND=C_BOOL) :: axis_ref__tmp 
     706      LOGICAL, OPTIONAL, INTENT(OUT) :: axis_type_ 
     707      LOGICAL(KIND=C_BOOL) :: axis_type__tmp 
    531708      LOGICAL, OPTIONAL, INTENT(OUT) :: begin_ 
    532709      LOGICAL(KIND=C_BOOL) :: begin__tmp 
    533710      LOGICAL, OPTIONAL, INTENT(OUT) :: bounds_ 
    534711      LOGICAL(KIND=C_BOOL) :: bounds__tmp 
     712      LOGICAL, OPTIONAL, INTENT(OUT) :: bounds_name_ 
     713      LOGICAL(KIND=C_BOOL) :: bounds_name__tmp 
     714      LOGICAL, OPTIONAL, INTENT(OUT) :: comment_ 
     715      LOGICAL(KIND=C_BOOL) :: comment__tmp 
    535716      LOGICAL, OPTIONAL, INTENT(OUT) :: data_begin_ 
    536717      LOGICAL(KIND=C_BOOL) :: data_begin__tmp 
    … …  
    539720      LOGICAL, OPTIONAL, INTENT(OUT) :: data_n_ 
    540721      LOGICAL(KIND=C_BOOL) :: data_n__tmp 
     722      LOGICAL, OPTIONAL, INTENT(OUT) :: dim_name_ 
     723      LOGICAL(KIND=C_BOOL) :: dim_name__tmp 
     724      LOGICAL, OPTIONAL, INTENT(OUT) :: formula_ 
     725      LOGICAL(KIND=C_BOOL) :: formula__tmp 
     726      LOGICAL, OPTIONAL, INTENT(OUT) :: formula_bounds_ 
     727      LOGICAL(KIND=C_BOOL) :: formula_bounds__tmp 
     728      LOGICAL, OPTIONAL, INTENT(OUT) :: formula_term_ 
     729      LOGICAL(KIND=C_BOOL) :: formula_term__tmp 
     730      LOGICAL, OPTIONAL, INTENT(OUT) :: formula_term_bounds_ 
     731      LOGICAL(KIND=C_BOOL) :: formula_term_bounds__tmp 
    541732      LOGICAL, OPTIONAL, INTENT(OUT) :: index_ 
    542733      LOGICAL(KIND=C_BOOL) :: index__tmp 
    … …  
    572763      ENDIF 
    573764 
     765      IF (PRESENT(axis_type_)) THEN 
     766        axis_type__tmp = cxios_is_defined_axis_axis_type & 
     767      (axis_hdl%daddr) 
     768        axis_type_ = axis_type__tmp 
     769      ENDIF 
     770 
    574771      IF (PRESENT(begin_)) THEN 
    575772        begin__tmp = cxios_is_defined_axis_begin & 
    … …  
    584781      ENDIF 
    585782 
     783      IF (PRESENT(bounds_name_)) THEN 
     784        bounds_name__tmp = cxios_is_defined_axis_bounds_name & 
     785      (axis_hdl%daddr) 
     786        bounds_name_ = bounds_name__tmp 
     787      ENDIF 
     788 
     789      IF (PRESENT(comment_)) THEN 
     790        comment__tmp = cxios_is_defined_axis_comment & 
     791      (axis_hdl%daddr) 
     792        comment_ = comment__tmp 
     793      ENDIF 
     794 
    586795      IF (PRESENT(data_begin_)) THEN 
    587796        data_begin__tmp = cxios_is_defined_axis_data_begin & 
    … …  
    602811      ENDIF 
    603812 
     813      IF (PRESENT(dim_name_)) THEN 
     814        dim_name__tmp = cxios_is_defined_axis_dim_name & 
     815      (axis_hdl%daddr) 
     816        dim_name_ = dim_name__tmp 
     817      ENDIF 
     818 
     819      IF (PRESENT(formula_)) THEN 
     820        formula__tmp = cxios_is_defined_axis_formula & 
     821      (axis_hdl%daddr) 
     822        formula_ = formula__tmp 
     823      ENDIF 
     824 
     825      IF (PRESENT(formula_bounds_)) THEN 
     826        formula_bounds__tmp = cxios_is_defined_axis_formula_bounds & 
     827      (axis_hdl%daddr) 
     828        formula_bounds_ = formula_bounds__tmp 
     829      ENDIF 
     830 
     831      IF (PRESENT(formula_term_)) THEN 
     832        formula_term__tmp = cxios_is_defined_axis_formula_term & 
     833      (axis_hdl%daddr) 
     834        formula_term_ = formula_term__tmp 
     835      ENDIF 
     836 
     837      IF (PRESENT(formula_term_bounds_)) THEN 
     838        formula_term_bounds__tmp = cxios_is_defined_axis_formula_term_bounds & 
     839      (axis_hdl%daddr) 
     840        formula_term_bounds_ = formula_term_bounds__tmp 
     841      ENDIF 
     842 
    604843      IF (PRESENT(index_)) THEN 
    605844        index__tmp = cxios_is_defined_axis_index & 
Note: See TracChangeset for help on using the changeset viewer.