Ignore:
Timestamp:
01/26/16 18:19:09 (8 years ago)
Author:
mhnguyen
Message:

Adding some attributes for axis and grid (ticket 71, 78)

+) Add index attribute for axis
+) Change mask?d to mask_?d for grid

Test
+) On Curie
+) Test passes

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r791 r817  
    1212 
    1313  SUBROUTINE xios(set_gridgroup_attr)  & 
    14     ( gridgroup_id, description, group_ref, mask1, mask2, mask3, name ) 
     14    ( gridgroup_id, description, group_ref, mask_1d, mask_2d, mask_3d, name ) 
    1515 
    1616    IMPLICIT NONE 
    … …  
    1919      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description 
    2020      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref 
    21       LOGICAL  , OPTIONAL, INTENT(IN) :: mask1(:) 
    22       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask1_tmp(:) 
    23       LOGICAL  , OPTIONAL, INTENT(IN) :: mask2(:,:) 
    24       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask2_tmp(:,:) 
    25       LOGICAL  , OPTIONAL, INTENT(IN) :: mask3(:,:,:) 
    26       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask3_tmp(:,:,:) 
     21      LOGICAL  , OPTIONAL, INTENT(IN) :: mask_1d(:) 
     22      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_1d_tmp(:) 
     23      LOGICAL  , OPTIONAL, INTENT(IN) :: mask_2d(:,:) 
     24      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_2d_tmp(:,:) 
     25      LOGICAL  , OPTIONAL, INTENT(IN) :: mask_3d(:,:,:) 
     26      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_3d_tmp(:,:,:) 
    2727      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name 
    2828 
    2929      CALL xios(get_gridgroup_handle)(gridgroup_id,gridgroup_hdl) 
    3030      CALL xios(set_gridgroup_attr_hdl_)   & 
    31       ( gridgroup_hdl, description, group_ref, mask1, mask2, mask3, name ) 
     31      ( gridgroup_hdl, description, group_ref, mask_1d, mask_2d, mask_3d, name ) 
    3232 
    3333  END SUBROUTINE xios(set_gridgroup_attr) 
    3434 
    3535  SUBROUTINE xios(set_gridgroup_attr_hdl)  & 
    36     ( gridgroup_hdl, description, group_ref, mask1, mask2, mask3, name ) 
     36    ( gridgroup_hdl, description, group_ref, mask_1d, mask_2d, mask_3d, name ) 
    3737 
    3838    IMPLICIT NONE 
    … …  
    4040      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description 
    4141      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref 
    42       LOGICAL  , OPTIONAL, INTENT(IN) :: mask1(:) 
    43       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask1_tmp(:) 
    44       LOGICAL  , OPTIONAL, INTENT(IN) :: mask2(:,:) 
    45       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask2_tmp(:,:) 
    46       LOGICAL  , OPTIONAL, INTENT(IN) :: mask3(:,:,:) 
    47       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask3_tmp(:,:,:) 
     42      LOGICAL  , OPTIONAL, INTENT(IN) :: mask_1d(:) 
     43      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_1d_tmp(:) 
     44      LOGICAL  , OPTIONAL, INTENT(IN) :: mask_2d(:,:) 
     45      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_2d_tmp(:,:) 
     46      LOGICAL  , OPTIONAL, INTENT(IN) :: mask_3d(:,:,:) 
     47      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_3d_tmp(:,:,:) 
    4848      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name 
    4949 
    5050      CALL xios(set_gridgroup_attr_hdl_)  & 
    51       ( gridgroup_hdl, description, group_ref, mask1, mask2, mask3, name ) 
     51      ( gridgroup_hdl, description, group_ref, mask_1d, mask_2d, mask_3d, name ) 
    5252 
    5353  END SUBROUTINE xios(set_gridgroup_attr_hdl) 
    5454 
    5555  SUBROUTINE xios(set_gridgroup_attr_hdl_)   & 
    56     ( gridgroup_hdl, description_, group_ref_, mask1_, mask2_, mask3_, name_ ) 
     56    ( gridgroup_hdl, description_, group_ref_, mask_1d_, mask_2d_, mask_3d_, name_ ) 
    5757 
    5858    IMPLICIT NONE 
    … …  
    6060      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description_ 
    6161      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref_ 
    62       LOGICAL  , OPTIONAL, INTENT(IN) :: mask1_(:) 
    63       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask1__tmp(:) 
    64       LOGICAL  , OPTIONAL, INTENT(IN) :: mask2_(:,:) 
    65       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask2__tmp(:,:) 
    66       LOGICAL  , OPTIONAL, INTENT(IN) :: mask3_(:,:,:) 
    67       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask3__tmp(:,:,:) 
     62      LOGICAL  , OPTIONAL, INTENT(IN) :: mask_1d_(:) 
     63      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_1d__tmp(:) 
     64      LOGICAL  , OPTIONAL, INTENT(IN) :: mask_2d_(:,:) 
     65      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_2d__tmp(:,:) 
     66      LOGICAL  , OPTIONAL, INTENT(IN) :: mask_3d_(:,:,:) 
     67      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_3d__tmp(:,:,:) 
    6868      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name_ 
    6969 
    … …  
    7676      ENDIF 
    7777 
    78       IF (PRESENT(mask1_)) THEN 
    79         ALLOCATE(mask1__tmp(SIZE(mask1_,1))) 
    80         mask1__tmp = mask1_ 
    81         CALL cxios_set_gridgroup_mask1(gridgroup_hdl%daddr, mask1__tmp, SHAPE(mask1_)) 
    82       ENDIF 
    83  
    84       IF (PRESENT(mask2_)) THEN 
    85         ALLOCATE(mask2__tmp(SIZE(mask2_,1), SIZE(mask2_,2))) 
    86         mask2__tmp = mask2_ 
    87         CALL cxios_set_gridgroup_mask2(gridgroup_hdl%daddr, mask2__tmp, SHAPE(mask2_)) 
    88       ENDIF 
    89  
    90       IF (PRESENT(mask3_)) THEN 
    91         ALLOCATE(mask3__tmp(SIZE(mask3_,1), SIZE(mask3_,2), SIZE(mask3_,3))) 
    92         mask3__tmp = mask3_ 
    93         CALL cxios_set_gridgroup_mask3(gridgroup_hdl%daddr, mask3__tmp, SHAPE(mask3_)) 
     78      IF (PRESENT(mask_1d_)) THEN 
     79        ALLOCATE(mask_1d__tmp(SIZE(mask_1d_,1))) 
     80        mask_1d__tmp = mask_1d_ 
     81        CALL cxios_set_gridgroup_mask_1d(gridgroup_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_)) 
     82      ENDIF 
     83 
     84      IF (PRESENT(mask_2d_)) THEN 
     85        ALLOCATE(mask_2d__tmp(SIZE(mask_2d_,1), SIZE(mask_2d_,2))) 
     86        mask_2d__tmp = mask_2d_ 
     87        CALL cxios_set_gridgroup_mask_2d(gridgroup_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_)) 
     88      ENDIF 
     89 
     90      IF (PRESENT(mask_3d_)) THEN 
     91        ALLOCATE(mask_3d__tmp(SIZE(mask_3d_,1), SIZE(mask_3d_,2), SIZE(mask_3d_,3))) 
     92        mask_3d__tmp = mask_3d_ 
     93        CALL cxios_set_gridgroup_mask_3d(gridgroup_hdl%daddr, mask_3d__tmp, SHAPE(mask_3d_)) 
    9494      ENDIF 
    9595 
    … …  
    101101 
    102102  SUBROUTINE xios(get_gridgroup_attr)  & 
    103     ( gridgroup_id, description, group_ref, mask1, mask2, mask3, name ) 
     103    ( gridgroup_id, description, group_ref, mask_1d, mask_2d, mask_3d, name ) 
    104104 
    105105    IMPLICIT NONE 
    … …  
    108108      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description 
    109109      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref 
    110       LOGICAL  , OPTIONAL, INTENT(OUT) :: mask1(:) 
    111       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask1_tmp(:) 
    112       LOGICAL  , OPTIONAL, INTENT(OUT) :: mask2(:,:) 
    113       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask2_tmp(:,:) 
    114       LOGICAL  , OPTIONAL, INTENT(OUT) :: mask3(:,:,:) 
    115       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask3_tmp(:,:,:) 
     110      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask_1d(:) 
     111      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_1d_tmp(:) 
     112      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask_2d(:,:) 
     113      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_2d_tmp(:,:) 
     114      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask_3d(:,:,:) 
     115      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_3d_tmp(:,:,:) 
    116116      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name 
    117117 
    118118      CALL xios(get_gridgroup_handle)(gridgroup_id,gridgroup_hdl) 
    119119      CALL xios(get_gridgroup_attr_hdl_)   & 
    120       ( gridgroup_hdl, description, group_ref, mask1, mask2, mask3, name ) 
     120      ( gridgroup_hdl, description, group_ref, mask_1d, mask_2d, mask_3d, name ) 
    121121 
    122122  END SUBROUTINE xios(get_gridgroup_attr) 
    123123 
    124124  SUBROUTINE xios(get_gridgroup_attr_hdl)  & 
    125     ( gridgroup_hdl, description, group_ref, mask1, mask2, mask3, name ) 
     125    ( gridgroup_hdl, description, group_ref, mask_1d, mask_2d, mask_3d, name ) 
    126126 
    127127    IMPLICIT NONE 
    … …  
    129129      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description 
    130130      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref 
    131       LOGICAL  , OPTIONAL, INTENT(OUT) :: mask1(:) 
    132       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask1_tmp(:) 
    133       LOGICAL  , OPTIONAL, INTENT(OUT) :: mask2(:,:) 
    134       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask2_tmp(:,:) 
    135       LOGICAL  , OPTIONAL, INTENT(OUT) :: mask3(:,:,:) 
    136       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask3_tmp(:,:,:) 
     131      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask_1d(:) 
     132      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_1d_tmp(:) 
     133      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask_2d(:,:) 
     134      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_2d_tmp(:,:) 
     135      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask_3d(:,:,:) 
     136      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_3d_tmp(:,:,:) 
    137137      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name 
    138138 
    139139      CALL xios(get_gridgroup_attr_hdl_)  & 
    140       ( gridgroup_hdl, description, group_ref, mask1, mask2, mask3, name ) 
     140      ( gridgroup_hdl, description, group_ref, mask_1d, mask_2d, mask_3d, name ) 
    141141 
    142142  END SUBROUTINE xios(get_gridgroup_attr_hdl) 
    143143 
    144144  SUBROUTINE xios(get_gridgroup_attr_hdl_)   & 
    145     ( gridgroup_hdl, description_, group_ref_, mask1_, mask2_, mask3_, name_ ) 
     145    ( gridgroup_hdl, description_, group_ref_, mask_1d_, mask_2d_, mask_3d_, name_ ) 
    146146 
    147147    IMPLICIT NONE 
    … …  
    149149      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description_ 
    150150      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref_ 
    151       LOGICAL  , OPTIONAL, INTENT(OUT) :: mask1_(:) 
    152       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask1__tmp(:) 
    153       LOGICAL  , OPTIONAL, INTENT(OUT) :: mask2_(:,:) 
    154       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask2__tmp(:,:) 
    155       LOGICAL  , OPTIONAL, INTENT(OUT) :: mask3_(:,:,:) 
    156       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask3__tmp(:,:,:) 
     151      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask_1d_(:) 
     152      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_1d__tmp(:) 
     153      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask_2d_(:,:) 
     154      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_2d__tmp(:,:) 
     155      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask_3d_(:,:,:) 
     156      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_3d__tmp(:,:,:) 
    157157      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name_ 
    158158 
    … …  
    165165      ENDIF 
    166166 
    167       IF (PRESENT(mask1_)) THEN 
    168         ALLOCATE(mask1__tmp(SIZE(mask1_,1))) 
    169         CALL cxios_get_gridgroup_mask1(gridgroup_hdl%daddr, mask1__tmp, SHAPE(mask1_)) 
    170         mask1_ = mask1__tmp 
    171       ENDIF 
    172  
    173       IF (PRESENT(mask2_)) THEN 
    174         ALLOCATE(mask2__tmp(SIZE(mask2_,1), SIZE(mask2_,2))) 
    175         CALL cxios_get_gridgroup_mask2(gridgroup_hdl%daddr, mask2__tmp, SHAPE(mask2_)) 
    176         mask2_ = mask2__tmp 
    177       ENDIF 
    178  
    179       IF (PRESENT(mask3_)) THEN 
    180         ALLOCATE(mask3__tmp(SIZE(mask3_,1), SIZE(mask3_,2), SIZE(mask3_,3))) 
    181         CALL cxios_get_gridgroup_mask3(gridgroup_hdl%daddr, mask3__tmp, SHAPE(mask3_)) 
    182         mask3_ = mask3__tmp 
     167      IF (PRESENT(mask_1d_)) THEN 
     168        ALLOCATE(mask_1d__tmp(SIZE(mask_1d_,1))) 
     169        CALL cxios_get_gridgroup_mask_1d(gridgroup_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_)) 
     170        mask_1d_ = mask_1d__tmp 
     171      ENDIF 
     172 
     173      IF (PRESENT(mask_2d_)) THEN 
     174        ALLOCATE(mask_2d__tmp(SIZE(mask_2d_,1), SIZE(mask_2d_,2))) 
     175        CALL cxios_get_gridgroup_mask_2d(gridgroup_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_)) 
     176        mask_2d_ = mask_2d__tmp 
     177      ENDIF 
     178 
     179      IF (PRESENT(mask_3d_)) THEN 
     180        ALLOCATE(mask_3d__tmp(SIZE(mask_3d_,1), SIZE(mask_3d_,2), SIZE(mask_3d_,3))) 
     181        CALL cxios_get_gridgroup_mask_3d(gridgroup_hdl%daddr, mask_3d__tmp, SHAPE(mask_3d_)) 
     182        mask_3d_ = mask_3d__tmp 
    183183      ENDIF 
    184184 
    … …  
    190190 
    191191  SUBROUTINE xios(is_defined_gridgroup_attr)  & 
    192     ( gridgroup_id, description, group_ref, mask1, mask2, mask3, name ) 
     192    ( gridgroup_id, description, group_ref, mask_1d, mask_2d, mask_3d, name ) 
    193193 
    194194    IMPLICIT NONE 
    … …  
    199199      LOGICAL, OPTIONAL, INTENT(OUT) :: group_ref 
    200200      LOGICAL(KIND=C_BOOL) :: group_ref_tmp 
    201       LOGICAL, OPTIONAL, INTENT(OUT) :: mask1 
    202       LOGICAL(KIND=C_BOOL) :: mask1_tmp 
    203       LOGICAL, OPTIONAL, INTENT(OUT) :: mask2 
    204       LOGICAL(KIND=C_BOOL) :: mask2_tmp 
    205       LOGICAL, OPTIONAL, INTENT(OUT) :: mask3 
    206       LOGICAL(KIND=C_BOOL) :: mask3_tmp 
     201      LOGICAL, OPTIONAL, INTENT(OUT) :: mask_1d 
     202      LOGICAL(KIND=C_BOOL) :: mask_1d_tmp 
     203      LOGICAL, OPTIONAL, INTENT(OUT) :: mask_2d 
     204      LOGICAL(KIND=C_BOOL) :: mask_2d_tmp 
     205      LOGICAL, OPTIONAL, INTENT(OUT) :: mask_3d 
     206      LOGICAL(KIND=C_BOOL) :: mask_3d_tmp 
    207207      LOGICAL, OPTIONAL, INTENT(OUT) :: name 
    208208      LOGICAL(KIND=C_BOOL) :: name_tmp 
    … …  
    210210      CALL xios(get_gridgroup_handle)(gridgroup_id,gridgroup_hdl) 
    211211      CALL xios(is_defined_gridgroup_attr_hdl_)   & 
    212       ( gridgroup_hdl, description, group_ref, mask1, mask2, mask3, name ) 
     212      ( gridgroup_hdl, description, group_ref, mask_1d, mask_2d, mask_3d, name ) 
    213213 
    214214  END SUBROUTINE xios(is_defined_gridgroup_attr) 
    215215 
    216216  SUBROUTINE xios(is_defined_gridgroup_attr_hdl)  & 
    217     ( gridgroup_hdl, description, group_ref, mask1, mask2, mask3, name ) 
     217    ( gridgroup_hdl, description, group_ref, mask_1d, mask_2d, mask_3d, name ) 
    218218 
    219219    IMPLICIT NONE 
    … …  
    223223      LOGICAL, OPTIONAL, INTENT(OUT) :: group_ref 
    224224      LOGICAL(KIND=C_BOOL) :: group_ref_tmp 
    225       LOGICAL, OPTIONAL, INTENT(OUT) :: mask1 
    226       LOGICAL(KIND=C_BOOL) :: mask1_tmp 
    227       LOGICAL, OPTIONAL, INTENT(OUT) :: mask2 
    228       LOGICAL(KIND=C_BOOL) :: mask2_tmp 
    229       LOGICAL, OPTIONAL, INTENT(OUT) :: mask3 
    230       LOGICAL(KIND=C_BOOL) :: mask3_tmp 
     225      LOGICAL, OPTIONAL, INTENT(OUT) :: mask_1d 
     226      LOGICAL(KIND=C_BOOL) :: mask_1d_tmp 
     227      LOGICAL, OPTIONAL, INTENT(OUT) :: mask_2d 
     228      LOGICAL(KIND=C_BOOL) :: mask_2d_tmp 
     229      LOGICAL, OPTIONAL, INTENT(OUT) :: mask_3d 
     230      LOGICAL(KIND=C_BOOL) :: mask_3d_tmp 
    231231      LOGICAL, OPTIONAL, INTENT(OUT) :: name 
    232232      LOGICAL(KIND=C_BOOL) :: name_tmp 
    233233 
    234234      CALL xios(is_defined_gridgroup_attr_hdl_)  & 
    235       ( gridgroup_hdl, description, group_ref, mask1, mask2, mask3, name ) 
     235      ( gridgroup_hdl, description, group_ref, mask_1d, mask_2d, mask_3d, name ) 
    236236 
    237237  END SUBROUTINE xios(is_defined_gridgroup_attr_hdl) 
    238238 
    239239  SUBROUTINE xios(is_defined_gridgroup_attr_hdl_)   & 
    240     ( gridgroup_hdl, description_, group_ref_, mask1_, mask2_, mask3_, name_ ) 
     240    ( gridgroup_hdl, description_, group_ref_, mask_1d_, mask_2d_, mask_3d_, name_ ) 
    241241 
    242242    IMPLICIT NONE 
    … …  
    246246      LOGICAL, OPTIONAL, INTENT(OUT) :: group_ref_ 
    247247      LOGICAL(KIND=C_BOOL) :: group_ref__tmp 
    248       LOGICAL, OPTIONAL, INTENT(OUT) :: mask1_ 
    249       LOGICAL(KIND=C_BOOL) :: mask1__tmp 
    250       LOGICAL, OPTIONAL, INTENT(OUT) :: mask2_ 
    251       LOGICAL(KIND=C_BOOL) :: mask2__tmp 
    252       LOGICAL, OPTIONAL, INTENT(OUT) :: mask3_ 
    253       LOGICAL(KIND=C_BOOL) :: mask3__tmp 
     248      LOGICAL, OPTIONAL, INTENT(OUT) :: mask_1d_ 
     249      LOGICAL(KIND=C_BOOL) :: mask_1d__tmp 
     250      LOGICAL, OPTIONAL, INTENT(OUT) :: mask_2d_ 
     251      LOGICAL(KIND=C_BOOL) :: mask_2d__tmp 
     252      LOGICAL, OPTIONAL, INTENT(OUT) :: mask_3d_ 
     253      LOGICAL(KIND=C_BOOL) :: mask_3d__tmp 
    254254      LOGICAL, OPTIONAL, INTENT(OUT) :: name_ 
    255255      LOGICAL(KIND=C_BOOL) :: name__tmp 
    … …  
    265265      ENDIF 
    266266 
    267       IF (PRESENT(mask1_)) THEN 
    268         mask1__tmp = cxios_is_defined_gridgroup_mask1(gridgroup_hdl%daddr) 
    269         mask1_ = mask1__tmp 
    270       ENDIF 
    271  
    272       IF (PRESENT(mask2_)) THEN 
    273         mask2__tmp = cxios_is_defined_gridgroup_mask2(gridgroup_hdl%daddr) 
    274         mask2_ = mask2__tmp 
    275       ENDIF 
    276  
    277       IF (PRESENT(mask3_)) THEN 
    278         mask3__tmp = cxios_is_defined_gridgroup_mask3(gridgroup_hdl%daddr) 
    279         mask3_ = mask3__tmp 
     267      IF (PRESENT(mask_1d_)) THEN 
     268        mask_1d__tmp = cxios_is_defined_gridgroup_mask_1d(gridgroup_hdl%daddr) 
     269        mask_1d_ = mask_1d__tmp 
     270      ENDIF 
     271 
     272      IF (PRESENT(mask_2d_)) THEN 
     273        mask_2d__tmp = cxios_is_defined_gridgroup_mask_2d(gridgroup_hdl%daddr) 
     274        mask_2d_ = mask_2d__tmp 
     275      ENDIF 
     276 
     277      IF (PRESENT(mask_3d_)) THEN 
     278        mask_3d__tmp = cxios_is_defined_gridgroup_mask_3d(gridgroup_hdl%daddr) 
     279        mask_3d_ = mask_3d__tmp 
    280280      ENDIF 
    281281 
Note: See TracChangeset for help on using the changeset viewer.