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/gridgroup_interface_attr.F90

    r791 r817  
    5252 
    5353 
    54     SUBROUTINE cxios_set_gridgroup_mask1(gridgroup_hdl, mask1, extent) BIND(C) 
     54    SUBROUTINE cxios_set_gridgroup_mask_1d(gridgroup_hdl, mask_1d, extent) BIND(C) 
    5555      USE ISO_C_BINDING 
    5656      INTEGER (kind = C_INTPTR_T), VALUE       :: gridgroup_hdl 
    57       LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask1 
     57      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask_1d 
    5858      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    59     END SUBROUTINE cxios_set_gridgroup_mask1 
     59    END SUBROUTINE cxios_set_gridgroup_mask_1d 
    6060 
    61     SUBROUTINE cxios_get_gridgroup_mask1(gridgroup_hdl, mask1, extent) BIND(C) 
     61    SUBROUTINE cxios_get_gridgroup_mask_1d(gridgroup_hdl, mask_1d, extent) BIND(C) 
    6262      USE ISO_C_BINDING 
    6363      INTEGER (kind = C_INTPTR_T), VALUE       :: gridgroup_hdl 
    64       LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask1 
     64      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask_1d 
    6565      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    66     END SUBROUTINE cxios_get_gridgroup_mask1 
     66    END SUBROUTINE cxios_get_gridgroup_mask_1d 
    6767 
    68     FUNCTION cxios_is_defined_gridgroup_mask1(gridgroup_hdl) BIND(C) 
     68    FUNCTION cxios_is_defined_gridgroup_mask_1d(gridgroup_hdl) BIND(C) 
    6969      USE ISO_C_BINDING 
    70       LOGICAL(kind=C_BOOL) :: cxios_is_defined_gridgroup_mask1 
     70      LOGICAL(kind=C_BOOL) :: cxios_is_defined_gridgroup_mask_1d 
    7171      INTEGER (kind = C_INTPTR_T), VALUE :: gridgroup_hdl 
    72     END FUNCTION cxios_is_defined_gridgroup_mask1 
     72    END FUNCTION cxios_is_defined_gridgroup_mask_1d 
    7373 
    7474 
    75     SUBROUTINE cxios_set_gridgroup_mask2(gridgroup_hdl, mask2, extent) BIND(C) 
     75    SUBROUTINE cxios_set_gridgroup_mask_2d(gridgroup_hdl, mask_2d, extent) BIND(C) 
    7676      USE ISO_C_BINDING 
    7777      INTEGER (kind = C_INTPTR_T), VALUE       :: gridgroup_hdl 
    78       LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask2 
     78      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask_2d 
    7979      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    80     END SUBROUTINE cxios_set_gridgroup_mask2 
     80    END SUBROUTINE cxios_set_gridgroup_mask_2d 
    8181 
    82     SUBROUTINE cxios_get_gridgroup_mask2(gridgroup_hdl, mask2, extent) BIND(C) 
     82    SUBROUTINE cxios_get_gridgroup_mask_2d(gridgroup_hdl, mask_2d, extent) BIND(C) 
    8383      USE ISO_C_BINDING 
    8484      INTEGER (kind = C_INTPTR_T), VALUE       :: gridgroup_hdl 
    85       LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask2 
     85      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask_2d 
    8686      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    87     END SUBROUTINE cxios_get_gridgroup_mask2 
     87    END SUBROUTINE cxios_get_gridgroup_mask_2d 
    8888 
    89     FUNCTION cxios_is_defined_gridgroup_mask2(gridgroup_hdl) BIND(C) 
     89    FUNCTION cxios_is_defined_gridgroup_mask_2d(gridgroup_hdl) BIND(C) 
    9090      USE ISO_C_BINDING 
    91       LOGICAL(kind=C_BOOL) :: cxios_is_defined_gridgroup_mask2 
     91      LOGICAL(kind=C_BOOL) :: cxios_is_defined_gridgroup_mask_2d 
    9292      INTEGER (kind = C_INTPTR_T), VALUE :: gridgroup_hdl 
    93     END FUNCTION cxios_is_defined_gridgroup_mask2 
     93    END FUNCTION cxios_is_defined_gridgroup_mask_2d 
    9494 
    9595 
    96     SUBROUTINE cxios_set_gridgroup_mask3(gridgroup_hdl, mask3, extent) BIND(C) 
     96    SUBROUTINE cxios_set_gridgroup_mask_3d(gridgroup_hdl, mask_3d, extent) BIND(C) 
    9797      USE ISO_C_BINDING 
    9898      INTEGER (kind = C_INTPTR_T), VALUE       :: gridgroup_hdl 
    99       LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask3 
     99      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask_3d 
    100100      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    101     END SUBROUTINE cxios_set_gridgroup_mask3 
     101    END SUBROUTINE cxios_set_gridgroup_mask_3d 
    102102 
    103     SUBROUTINE cxios_get_gridgroup_mask3(gridgroup_hdl, mask3, extent) BIND(C) 
     103    SUBROUTINE cxios_get_gridgroup_mask_3d(gridgroup_hdl, mask_3d, extent) BIND(C) 
    104104      USE ISO_C_BINDING 
    105105      INTEGER (kind = C_INTPTR_T), VALUE       :: gridgroup_hdl 
    106       LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask3 
     106      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: mask_3d 
    107107      INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    108     END SUBROUTINE cxios_get_gridgroup_mask3 
     108    END SUBROUTINE cxios_get_gridgroup_mask_3d 
    109109 
    110     FUNCTION cxios_is_defined_gridgroup_mask3(gridgroup_hdl) BIND(C) 
     110    FUNCTION cxios_is_defined_gridgroup_mask_3d(gridgroup_hdl) BIND(C) 
    111111      USE ISO_C_BINDING 
    112       LOGICAL(kind=C_BOOL) :: cxios_is_defined_gridgroup_mask3 
     112      LOGICAL(kind=C_BOOL) :: cxios_is_defined_gridgroup_mask_3d 
    113113      INTEGER (kind = C_INTPTR_T), VALUE :: gridgroup_hdl 
    114     END FUNCTION cxios_is_defined_gridgroup_mask3 
     114    END FUNCTION cxios_is_defined_gridgroup_mask_3d 
    115115 
    116116 
Note: See TracChangeset for help on using the changeset viewer.