Ignore:
Timestamp:
11/19/15 16:55:16 (9 years ago)
Author:
rlacroix
Message:

Grid: Make the axis_domain_order attribute private.

It was never meant to be used directly by our users.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • XIOS/trunk/src/interface/fortran_attr/igrid_attr.F90

    r674 r791  
    1212 
    1313  SUBROUTINE xios(set_grid_attr)  & 
    14     ( grid_id, axis_domain_order, description, mask1, mask2, mask3, name ) 
     14    ( grid_id, description, mask1, mask2, mask3, name ) 
    1515 
    1616    IMPLICIT NONE 
    1717      TYPE(txios(grid))  :: grid_hdl 
    1818      CHARACTER(LEN=*), INTENT(IN) ::grid_id 
    19       LOGICAL  , OPTIONAL, INTENT(IN) :: axis_domain_order(:) 
    20       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axis_domain_order_tmp(:) 
    2119      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description 
    2220      LOGICAL  , OPTIONAL, INTENT(IN) :: mask1(:) 
    … …  
    3028      CALL xios(get_grid_handle)(grid_id,grid_hdl) 
    3129      CALL xios(set_grid_attr_hdl_)   & 
    32       ( grid_hdl, axis_domain_order, description, mask1, mask2, mask3, name ) 
     30      ( grid_hdl, description, mask1, mask2, mask3, name ) 
    3331 
    3432  END SUBROUTINE xios(set_grid_attr) 
    3533 
    3634  SUBROUTINE xios(set_grid_attr_hdl)  & 
    37     ( grid_hdl, axis_domain_order, description, mask1, mask2, mask3, name ) 
    38  
    39     IMPLICIT NONE 
    40       TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    41       LOGICAL  , OPTIONAL, INTENT(IN) :: axis_domain_order(:) 
    42       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axis_domain_order_tmp(:) 
     35    ( grid_hdl, description, mask1, mask2, mask3, name ) 
     36 
     37    IMPLICIT NONE 
     38      TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    4339      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description 
    4440      LOGICAL  , OPTIONAL, INTENT(IN) :: mask1(:) 
    … …  
    5147 
    5248      CALL xios(set_grid_attr_hdl_)  & 
    53       ( grid_hdl, axis_domain_order, description, mask1, mask2, mask3, name ) 
     49      ( grid_hdl, description, mask1, mask2, mask3, name ) 
    5450 
    5551  END SUBROUTINE xios(set_grid_attr_hdl) 
    5652 
    5753  SUBROUTINE xios(set_grid_attr_hdl_)   & 
    58     ( grid_hdl, axis_domain_order_, description_, mask1_, mask2_, mask3_, name_ ) 
    59  
    60     IMPLICIT NONE 
    61       TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    62       LOGICAL  , OPTIONAL, INTENT(IN) :: axis_domain_order_(:) 
    63       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axis_domain_order__tmp(:) 
     54    ( grid_hdl, description_, mask1_, mask2_, mask3_, name_ ) 
     55 
     56    IMPLICIT NONE 
     57      TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    6458      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description_ 
    6559      LOGICAL  , OPTIONAL, INTENT(IN) :: mask1_(:) 
    … …  
    7165      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name_ 
    7266 
    73       IF (PRESENT(axis_domain_order_)) THEN 
    74         ALLOCATE(axis_domain_order__tmp(SIZE(axis_domain_order_,1))) 
    75         axis_domain_order__tmp = axis_domain_order_ 
    76         CALL cxios_set_grid_axis_domain_order(grid_hdl%daddr, axis_domain_order__tmp, SHAPE(axis_domain_order_)) 
    77       ENDIF 
    78  
    7967      IF (PRESENT(description_)) THEN 
    8068        CALL cxios_set_grid_description(grid_hdl%daddr, description_, len(description_)) 
    … …  
    10694 
    10795  SUBROUTINE xios(get_grid_attr)  & 
    108     ( grid_id, axis_domain_order, description, mask1, mask2, mask3, name ) 
     96    ( grid_id, description, mask1, mask2, mask3, name ) 
    10997 
    11098    IMPLICIT NONE 
    11199      TYPE(txios(grid))  :: grid_hdl 
    112100      CHARACTER(LEN=*), INTENT(IN) ::grid_id 
    113       LOGICAL  , OPTIONAL, INTENT(OUT) :: axis_domain_order(:) 
    114       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axis_domain_order_tmp(:) 
    115101      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description 
    116102      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask1(:) 
    … …  
    124110      CALL xios(get_grid_handle)(grid_id,grid_hdl) 
    125111      CALL xios(get_grid_attr_hdl_)   & 
    126       ( grid_hdl, axis_domain_order, description, mask1, mask2, mask3, name ) 
     112      ( grid_hdl, description, mask1, mask2, mask3, name ) 
    127113 
    128114  END SUBROUTINE xios(get_grid_attr) 
    129115 
    130116  SUBROUTINE xios(get_grid_attr_hdl)  & 
    131     ( grid_hdl, axis_domain_order, description, mask1, mask2, mask3, name ) 
    132  
    133     IMPLICIT NONE 
    134       TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    135       LOGICAL  , OPTIONAL, INTENT(OUT) :: axis_domain_order(:) 
    136       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axis_domain_order_tmp(:) 
     117    ( grid_hdl, description, mask1, mask2, mask3, name ) 
     118 
     119    IMPLICIT NONE 
     120      TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    137121      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description 
    138122      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask1(:) 
    … …  
    145129 
    146130      CALL xios(get_grid_attr_hdl_)  & 
    147       ( grid_hdl, axis_domain_order, description, mask1, mask2, mask3, name ) 
     131      ( grid_hdl, description, mask1, mask2, mask3, name ) 
    148132 
    149133  END SUBROUTINE xios(get_grid_attr_hdl) 
    150134 
    151135  SUBROUTINE xios(get_grid_attr_hdl_)   & 
    152     ( grid_hdl, axis_domain_order_, description_, mask1_, mask2_, mask3_, name_ ) 
    153  
    154     IMPLICIT NONE 
    155       TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    156       LOGICAL  , OPTIONAL, INTENT(OUT) :: axis_domain_order_(:) 
    157       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axis_domain_order__tmp(:) 
     136    ( grid_hdl, description_, mask1_, mask2_, mask3_, name_ ) 
     137 
     138    IMPLICIT NONE 
     139      TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    158140      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description_ 
    159141      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask1_(:) 
    … …  
    165147      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name_ 
    166148 
    167       IF (PRESENT(axis_domain_order_)) THEN 
    168         ALLOCATE(axis_domain_order__tmp(SIZE(axis_domain_order_,1))) 
    169         CALL cxios_get_grid_axis_domain_order(grid_hdl%daddr, axis_domain_order__tmp, SHAPE(axis_domain_order_)) 
    170         axis_domain_order_ = axis_domain_order__tmp 
    171       ENDIF 
    172  
    173149      IF (PRESENT(description_)) THEN 
    174150        CALL cxios_get_grid_description(grid_hdl%daddr, description_, len(description_)) 
    … …  
    200176 
    201177  SUBROUTINE xios(is_defined_grid_attr)  & 
    202     ( grid_id, axis_domain_order, description, mask1, mask2, mask3, name ) 
     178    ( grid_id, description, mask1, mask2, mask3, name ) 
    203179 
    204180    IMPLICIT NONE 
    205181      TYPE(txios(grid))  :: grid_hdl 
    206182      CHARACTER(LEN=*), INTENT(IN) ::grid_id 
    207       LOGICAL, OPTIONAL, INTENT(OUT) :: axis_domain_order 
    208       LOGICAL(KIND=C_BOOL) :: axis_domain_order_tmp 
    209183      LOGICAL, OPTIONAL, INTENT(OUT) :: description 
    210184      LOGICAL(KIND=C_BOOL) :: description_tmp 
    … …  
    220194      CALL xios(get_grid_handle)(grid_id,grid_hdl) 
    221195      CALL xios(is_defined_grid_attr_hdl_)   & 
    222       ( grid_hdl, axis_domain_order, description, mask1, mask2, mask3, name ) 
     196      ( grid_hdl, description, mask1, mask2, mask3, name ) 
    223197 
    224198  END SUBROUTINE xios(is_defined_grid_attr) 
    225199 
    226200  SUBROUTINE xios(is_defined_grid_attr_hdl)  & 
    227     ( grid_hdl, axis_domain_order, description, mask1, mask2, mask3, name ) 
    228  
    229     IMPLICIT NONE 
    230       TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    231       LOGICAL, OPTIONAL, INTENT(OUT) :: axis_domain_order 
    232       LOGICAL(KIND=C_BOOL) :: axis_domain_order_tmp 
     201    ( grid_hdl, description, mask1, mask2, mask3, name ) 
     202 
     203    IMPLICIT NONE 
     204      TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    233205      LOGICAL, OPTIONAL, INTENT(OUT) :: description 
    234206      LOGICAL(KIND=C_BOOL) :: description_tmp 
    … …  
    243215 
    244216      CALL xios(is_defined_grid_attr_hdl_)  & 
    245       ( grid_hdl, axis_domain_order, description, mask1, mask2, mask3, name ) 
     217      ( grid_hdl, description, mask1, mask2, mask3, name ) 
    246218 
    247219  END SUBROUTINE xios(is_defined_grid_attr_hdl) 
    248220 
    249221  SUBROUTINE xios(is_defined_grid_attr_hdl_)   & 
    250     ( grid_hdl, axis_domain_order_, description_, mask1_, mask2_, mask3_, name_ ) 
    251  
    252     IMPLICIT NONE 
    253       TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    254       LOGICAL, OPTIONAL, INTENT(OUT) :: axis_domain_order_ 
    255       LOGICAL(KIND=C_BOOL) :: axis_domain_order__tmp 
     222    ( grid_hdl, description_, mask1_, mask2_, mask3_, name_ ) 
     223 
     224    IMPLICIT NONE 
     225      TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    256226      LOGICAL, OPTIONAL, INTENT(OUT) :: description_ 
    257227      LOGICAL(KIND=C_BOOL) :: description__tmp 
    … …  
    265235      LOGICAL(KIND=C_BOOL) :: name__tmp 
    266236 
    267       IF (PRESENT(axis_domain_order_)) THEN 
    268         axis_domain_order__tmp = cxios_is_defined_grid_axis_domain_order(grid_hdl%daddr) 
    269         axis_domain_order_ = axis_domain_order__tmp 
    270       ENDIF 
    271  
    272237      IF (PRESENT(description_)) THEN 
    273238        description__tmp = cxios_is_defined_grid_description(grid_hdl%daddr) 
Note: See TracChangeset for help on using the changeset viewer.