Ignore:
Timestamp:
09/24/20 12:16:22 (4 years ago)
Author:
ymipsl
Message:

XIOS coupling : Update fortran interface
YM

File:
1 edited

Legend:

Unmodified
Added
Removed

  • XIOS/dev/dev_ym/XIOS_COUPLING/src/interface/fortran_attr/iscalargroup_attr.F90

    r1492 r1941  
    1212 
    1313  SUBROUTINE xios(set_scalargroup_attr)  & 
    14     ( scalargroup_id, axis_type, bounds, bounds_name, comment, group_ref, label, long_name, name  & 
    15     , positive, prec, scalar_ref, standard_name, unit, value ) 
     14    ( scalargroup_id, axis_type, bounds, bounds_name, comment, group_ref, label, long_name, mask  & 
     15    , name, positive, prec, scalar_ref, standard_name, unit, value ) 
    1616 
    1717    IMPLICIT NONE 
    … …  
    2525      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: label 
    2626      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name 
     27      LOGICAL  , OPTIONAL, INTENT(IN) :: mask 
     28      LOGICAL (KIND=C_BOOL) :: mask_tmp 
    2729      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name 
    2830      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: positive 
    … …  
    3638      (scalargroup_id,scalargroup_hdl) 
    3739      CALL xios(set_scalargroup_attr_hdl_)   & 
    38       ( scalargroup_hdl, axis_type, bounds, bounds_name, comment, group_ref, label, long_name, name  & 
    39       , positive, prec, scalar_ref, standard_name, unit, value ) 
     40      ( scalargroup_hdl, axis_type, bounds, bounds_name, comment, group_ref, label, long_name, mask  & 
     41      , name, positive, prec, scalar_ref, standard_name, unit, value ) 
    4042 
    4143  END SUBROUTINE xios(set_scalargroup_attr) 
    4244 
    4345  SUBROUTINE xios(set_scalargroup_attr_hdl)  & 
    44     ( scalargroup_hdl, axis_type, bounds, bounds_name, comment, group_ref, label, long_name, name  & 
    45     , positive, prec, scalar_ref, standard_name, unit, value ) 
     46    ( scalargroup_hdl, axis_type, bounds, bounds_name, comment, group_ref, label, long_name, mask  & 
     47    , name, positive, prec, scalar_ref, standard_name, unit, value ) 
    4648 
    4749    IMPLICIT NONE 
    … …  
    5456      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: label 
    5557      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name 
     58      LOGICAL  , OPTIONAL, INTENT(IN) :: mask 
     59      LOGICAL (KIND=C_BOOL) :: mask_tmp 
    5660      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name 
    5761      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: positive 
    … …  
    6367 
    6468      CALL xios(set_scalargroup_attr_hdl_)  & 
    65       ( scalargroup_hdl, axis_type, bounds, bounds_name, comment, group_ref, label, long_name, name  & 
    66       , positive, prec, scalar_ref, standard_name, unit, value ) 
     69      ( scalargroup_hdl, axis_type, bounds, bounds_name, comment, group_ref, label, long_name, mask  & 
     70      , name, positive, prec, scalar_ref, standard_name, unit, value ) 
    6771 
    6872  END SUBROUTINE xios(set_scalargroup_attr_hdl) 
    … …  
    7074  SUBROUTINE xios(set_scalargroup_attr_hdl_)   & 
    7175    ( scalargroup_hdl, axis_type_, bounds_, bounds_name_, comment_, group_ref_, label_, long_name_  & 
    72     , name_, positive_, prec_, scalar_ref_, standard_name_, unit_, value_ ) 
     76    , mask_, name_, positive_, prec_, scalar_ref_, standard_name_, unit_, value_ ) 
    7377 
    7478    IMPLICIT NONE 
    … …  
    8185      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: label_ 
    8286      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: long_name_ 
     87      LOGICAL  , OPTIONAL, INTENT(IN) :: mask_ 
     88      LOGICAL (KIND=C_BOOL) :: mask__tmp 
    8389      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name_ 
    8490      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: positive_ 
    … …  
    124130      ENDIF 
    125131 
     132      IF (PRESENT(mask_)) THEN 
     133        mask__tmp = mask_ 
     134        CALL cxios_set_scalargroup_mask & 
     135      (scalargroup_hdl%daddr, mask__tmp) 
     136      ENDIF 
     137 
    126138      IF (PRESENT(name_)) THEN 
    127139        CALL cxios_set_scalargroup_name & 
    … …  
    162174 
    163175  SUBROUTINE xios(get_scalargroup_attr)  & 
    164     ( scalargroup_id, axis_type, bounds, bounds_name, comment, group_ref, label, long_name, name  & 
    165     , positive, prec, scalar_ref, standard_name, unit, value ) 
     176    ( scalargroup_id, axis_type, bounds, bounds_name, comment, group_ref, label, long_name, mask  & 
     177    , name, positive, prec, scalar_ref, standard_name, unit, value ) 
    166178 
    167179    IMPLICIT NONE 
    … …  
    175187      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: label 
    176188      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name 
     189      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask 
     190      LOGICAL (KIND=C_BOOL) :: mask_tmp 
    177191      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name 
    178192      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: positive 
    … …  
    186200      (scalargroup_id,scalargroup_hdl) 
    187201      CALL xios(get_scalargroup_attr_hdl_)   & 
    188       ( scalargroup_hdl, axis_type, bounds, bounds_name, comment, group_ref, label, long_name, name  & 
    189       , positive, prec, scalar_ref, standard_name, unit, value ) 
     202      ( scalargroup_hdl, axis_type, bounds, bounds_name, comment, group_ref, label, long_name, mask  & 
     203      , name, positive, prec, scalar_ref, standard_name, unit, value ) 
    190204 
    191205  END SUBROUTINE xios(get_scalargroup_attr) 
    192206 
    193207  SUBROUTINE xios(get_scalargroup_attr_hdl)  & 
    194     ( scalargroup_hdl, axis_type, bounds, bounds_name, comment, group_ref, label, long_name, name  & 
    195     , positive, prec, scalar_ref, standard_name, unit, value ) 
     208    ( scalargroup_hdl, axis_type, bounds, bounds_name, comment, group_ref, label, long_name, mask  & 
     209    , name, positive, prec, scalar_ref, standard_name, unit, value ) 
    196210 
    197211    IMPLICIT NONE 
    … …  
    204218      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: label 
    205219      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name 
     220      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask 
     221      LOGICAL (KIND=C_BOOL) :: mask_tmp 
    206222      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name 
    207223      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: positive 
    … …  
    213229 
    214230      CALL xios(get_scalargroup_attr_hdl_)  & 
    215       ( scalargroup_hdl, axis_type, bounds, bounds_name, comment, group_ref, label, long_name, name  & 
    216       , positive, prec, scalar_ref, standard_name, unit, value ) 
     231      ( scalargroup_hdl, axis_type, bounds, bounds_name, comment, group_ref, label, long_name, mask  & 
     232      , name, positive, prec, scalar_ref, standard_name, unit, value ) 
    217233 
    218234  END SUBROUTINE xios(get_scalargroup_attr_hdl) 
    … …  
    220236  SUBROUTINE xios(get_scalargroup_attr_hdl_)   & 
    221237    ( scalargroup_hdl, axis_type_, bounds_, bounds_name_, comment_, group_ref_, label_, long_name_  & 
    222     , name_, positive_, prec_, scalar_ref_, standard_name_, unit_, value_ ) 
     238    , mask_, name_, positive_, prec_, scalar_ref_, standard_name_, unit_, value_ ) 
    223239 
    224240    IMPLICIT NONE 
    … …  
    231247      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: label_ 
    232248      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: long_name_ 
     249      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask_ 
     250      LOGICAL (KIND=C_BOOL) :: mask__tmp 
    233251      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name_ 
    234252      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: positive_ 
    … …  
    274292      ENDIF 
    275293 
     294      IF (PRESENT(mask_)) THEN 
     295        CALL cxios_get_scalargroup_mask & 
     296      (scalargroup_hdl%daddr, mask__tmp) 
     297        mask_ = mask__tmp 
     298      ENDIF 
     299 
    276300      IF (PRESENT(name_)) THEN 
    277301        CALL cxios_get_scalargroup_name & 
    … …  
    312336 
    313337  SUBROUTINE xios(is_defined_scalargroup_attr)  & 
    314     ( scalargroup_id, axis_type, bounds, bounds_name, comment, group_ref, label, long_name, name  & 
    315     , positive, prec, scalar_ref, standard_name, unit, value ) 
     338    ( scalargroup_id, axis_type, bounds, bounds_name, comment, group_ref, label, long_name, mask  & 
     339    , name, positive, prec, scalar_ref, standard_name, unit, value ) 
    316340 
    317341    IMPLICIT NONE 
    … …  
    332356      LOGICAL, OPTIONAL, INTENT(OUT) :: long_name 
    333357      LOGICAL(KIND=C_BOOL) :: long_name_tmp 
     358      LOGICAL, OPTIONAL, INTENT(OUT) :: mask 
     359      LOGICAL(KIND=C_BOOL) :: mask_tmp 
    334360      LOGICAL, OPTIONAL, INTENT(OUT) :: name 
    335361      LOGICAL(KIND=C_BOOL) :: name_tmp 
    … …  
    350376      (scalargroup_id,scalargroup_hdl) 
    351377      CALL xios(is_defined_scalargroup_attr_hdl_)   & 
    352       ( scalargroup_hdl, axis_type, bounds, bounds_name, comment, group_ref, label, long_name, name  & 
    353       , positive, prec, scalar_ref, standard_name, unit, value ) 
     378      ( scalargroup_hdl, axis_type, bounds, bounds_name, comment, group_ref, label, long_name, mask  & 
     379      , name, positive, prec, scalar_ref, standard_name, unit, value ) 
    354380 
    355381  END SUBROUTINE xios(is_defined_scalargroup_attr) 
    356382 
    357383  SUBROUTINE xios(is_defined_scalargroup_attr_hdl)  & 
    358     ( scalargroup_hdl, axis_type, bounds, bounds_name, comment, group_ref, label, long_name, name  & 
    359     , positive, prec, scalar_ref, standard_name, unit, value ) 
     384    ( scalargroup_hdl, axis_type, bounds, bounds_name, comment, group_ref, label, long_name, mask  & 
     385    , name, positive, prec, scalar_ref, standard_name, unit, value ) 
    360386 
    361387    IMPLICIT NONE 
    … …  
    375401      LOGICAL, OPTIONAL, INTENT(OUT) :: long_name 
    376402      LOGICAL(KIND=C_BOOL) :: long_name_tmp 
     403      LOGICAL, OPTIONAL, INTENT(OUT) :: mask 
     404      LOGICAL(KIND=C_BOOL) :: mask_tmp 
    377405      LOGICAL, OPTIONAL, INTENT(OUT) :: name 
    378406      LOGICAL(KIND=C_BOOL) :: name_tmp 
    … …  
    391419 
    392420      CALL xios(is_defined_scalargroup_attr_hdl_)  & 
    393       ( scalargroup_hdl, axis_type, bounds, bounds_name, comment, group_ref, label, long_name, name  & 
    394       , positive, prec, scalar_ref, standard_name, unit, value ) 
     421      ( scalargroup_hdl, axis_type, bounds, bounds_name, comment, group_ref, label, long_name, mask  & 
     422      , name, positive, prec, scalar_ref, standard_name, unit, value ) 
    395423 
    396424  END SUBROUTINE xios(is_defined_scalargroup_attr_hdl) 
    … …  
    398426  SUBROUTINE xios(is_defined_scalargroup_attr_hdl_)   & 
    399427    ( scalargroup_hdl, axis_type_, bounds_, bounds_name_, comment_, group_ref_, label_, long_name_  & 
    400     , name_, positive_, prec_, scalar_ref_, standard_name_, unit_, value_ ) 
     428    , mask_, name_, positive_, prec_, scalar_ref_, standard_name_, unit_, value_ ) 
    401429 
    402430    IMPLICIT NONE 
    … …  
    416444      LOGICAL, OPTIONAL, INTENT(OUT) :: long_name_ 
    417445      LOGICAL(KIND=C_BOOL) :: long_name__tmp 
     446      LOGICAL, OPTIONAL, INTENT(OUT) :: mask_ 
     447      LOGICAL(KIND=C_BOOL) :: mask__tmp 
    418448      LOGICAL, OPTIONAL, INTENT(OUT) :: name_ 
    419449      LOGICAL(KIND=C_BOOL) :: name__tmp 
    … …  
    473503      ENDIF 
    474504 
     505      IF (PRESENT(mask_)) THEN 
     506        mask__tmp = cxios_is_defined_scalargroup_mask & 
     507      (scalargroup_hdl%daddr) 
     508        mask_ = mask__tmp 
     509      ENDIF 
     510 
    475511      IF (PRESENT(name_)) THEN 
    476512        name__tmp = cxios_is_defined_scalargroup_name & 
Note: See TracChangeset for help on using the changeset viewer.