Changeset 791


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

Grid: Make the axis_domain_order attribute private.

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

Location:
XIOS/trunk/src
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • XIOS/trunk/src/config/grid_attribute.conf

    r575 r791  
    22DECLARE_ATTRIBUTE(StdString, description) 
    33 
    4 DECLARE_ARRAY(bool, 1 , mask1) 
    5 DECLARE_ARRAY(bool, 2 , mask2) 
    6 DECLARE_ARRAY(bool, 3 , mask3) 
    7 //DECLARE_ARRAY(bool, 4 , mask4) 
    8 //DECLARE_ARRAY(bool, 5 , mask5) 
    9 //DECLARE_ARRAY(bool, 6 , mask6) 
    10 //DECLARE_ARRAY(bool, 7 , mask7) 
     4DECLARE_ARRAY(bool, 1, mask1) 
     5DECLARE_ARRAY(bool, 2, mask2) 
     6DECLARE_ARRAY(bool, 3, mask3) 
     7//DECLARE_ARRAY(bool, 4, mask4) 
     8//DECLARE_ARRAY(bool, 5, mask5) 
     9//DECLARE_ARRAY(bool, 6, mask6) 
     10//DECLARE_ARRAY(bool, 7, mask7) 
    1111 
    1212 
    13 // These attributes should be used privately 
    1413// An array contains order of axis and domains composing of the grid 
    15 DECLARE_ARRAY(bool, 1 , axis_domain_order) 
     14DECLARE_ARRAY_PRIVATE(bool, 1, axis_domain_order) 

  • XIOS/trunk/src/interface/c_attr/icgrid_attr.cpp

    r674 r791  
    1717{ 
    1818  typedef xios::CGrid* grid_Ptr; 
    19  
    20   void cxios_set_grid_axis_domain_order(grid_Ptr grid_hdl, bool* axis_domain_order, int* extent) 
    21   { 
    22     CTimer::get("XIOS").resume(); 
    23     CArray<bool,1> tmp(axis_domain_order, shape(extent[0]), neverDeleteData); 
    24     grid_hdl->axis_domain_order.reference(tmp.copy()); 
    25      CTimer::get("XIOS").suspend(); 
    26   } 
    27  
    28   void cxios_get_grid_axis_domain_order(grid_Ptr grid_hdl, bool* axis_domain_order, int* extent) 
    29   { 
    30     CTimer::get("XIOS").resume(); 
    31     CArray<bool,1> tmp(axis_domain_order, shape(extent[0]), neverDeleteData); 
    32     tmp=grid_hdl->axis_domain_order.getInheritedValue(); 
    33      CTimer::get("XIOS").suspend(); 
    34   } 
    35  
    36   bool cxios_is_defined_grid_axis_domain_order(grid_Ptr grid_hdl) 
    37   { 
    38      CTimer::get("XIOS").resume(); 
    39      bool isDefined = grid_hdl->axis_domain_order.hasInheritedValue(); 
    40      CTimer::get("XIOS").suspend(); 
    41      return isDefined; 
    42   } 
    43  
    4419 
    4520  void cxios_set_grid_description(grid_Ptr grid_hdl, const char * description, int description_size) 

  • XIOS/trunk/src/interface/c_attr/icgridgroup_attr.cpp

    r674 r791  
    1717{ 
    1818  typedef xios::CGridGroup* gridgroup_Ptr; 
    19  
    20   void cxios_set_gridgroup_axis_domain_order(gridgroup_Ptr gridgroup_hdl, bool* axis_domain_order, int* extent) 
    21   { 
    22     CTimer::get("XIOS").resume(); 
    23     CArray<bool,1> tmp(axis_domain_order, shape(extent[0]), neverDeleteData); 
    24     gridgroup_hdl->axis_domain_order.reference(tmp.copy()); 
    25      CTimer::get("XIOS").suspend(); 
    26   } 
    27  
    28   void cxios_get_gridgroup_axis_domain_order(gridgroup_Ptr gridgroup_hdl, bool* axis_domain_order, int* extent) 
    29   { 
    30     CTimer::get("XIOS").resume(); 
    31     CArray<bool,1> tmp(axis_domain_order, shape(extent[0]), neverDeleteData); 
    32     tmp=gridgroup_hdl->axis_domain_order.getInheritedValue(); 
    33      CTimer::get("XIOS").suspend(); 
    34   } 
    35  
    36   bool cxios_is_defined_gridgroup_axis_domain_order(gridgroup_Ptr gridgroup_hdl) 
    37   { 
    38      CTimer::get("XIOS").resume(); 
    39      bool isDefined = gridgroup_hdl->axis_domain_order.hasInheritedValue(); 
    40      CTimer::get("XIOS").suspend(); 
    41      return isDefined; 
    42   } 
    43  
    4419 
    4520  void cxios_set_gridgroup_description(gridgroup_Ptr gridgroup_hdl, const char * description, int description_size) 

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

    r674 r791  
    99  INTERFACE 
    1010    ! Do not call directly / interface FORTRAN 2003 <-> C99 
    11  
    12     SUBROUTINE cxios_set_grid_axis_domain_order(grid_hdl, axis_domain_order, extent) BIND(C) 
    13       USE ISO_C_BINDING 
    14       INTEGER (kind = C_INTPTR_T), VALUE       :: grid_hdl 
    15       LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: axis_domain_order 
    16       INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    17     END SUBROUTINE cxios_set_grid_axis_domain_order 
    18  
    19     SUBROUTINE cxios_get_grid_axis_domain_order(grid_hdl, axis_domain_order, extent) BIND(C) 
    20       USE ISO_C_BINDING 
    21       INTEGER (kind = C_INTPTR_T), VALUE       :: grid_hdl 
    22       LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: axis_domain_order 
    23       INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    24     END SUBROUTINE cxios_get_grid_axis_domain_order 
    25  
    26     FUNCTION cxios_is_defined_grid_axis_domain_order(grid_hdl) BIND(C) 
    27       USE ISO_C_BINDING 
    28       LOGICAL(kind=C_BOOL) :: cxios_is_defined_grid_axis_domain_order 
    29       INTEGER (kind = C_INTPTR_T), VALUE :: grid_hdl 
    30     END FUNCTION cxios_is_defined_grid_axis_domain_order 
    31  
    3211 
    3312    SUBROUTINE cxios_set_grid_description(grid_hdl, description, description_size) BIND(C) 

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

    r674 r791  
    99  INTERFACE 
    1010    ! Do not call directly / interface FORTRAN 2003 <-> C99 
    11  
    12     SUBROUTINE cxios_set_gridgroup_axis_domain_order(gridgroup_hdl, axis_domain_order, extent) BIND(C) 
    13       USE ISO_C_BINDING 
    14       INTEGER (kind = C_INTPTR_T), VALUE       :: gridgroup_hdl 
    15       LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: axis_domain_order 
    16       INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    17     END SUBROUTINE cxios_set_gridgroup_axis_domain_order 
    18  
    19     SUBROUTINE cxios_get_gridgroup_axis_domain_order(gridgroup_hdl, axis_domain_order, extent) BIND(C) 
    20       USE ISO_C_BINDING 
    21       INTEGER (kind = C_INTPTR_T), VALUE       :: gridgroup_hdl 
    22       LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: axis_domain_order 
    23       INTEGER (kind = C_INT), DIMENSION(*)     :: extent 
    24     END SUBROUTINE cxios_get_gridgroup_axis_domain_order 
    25  
    26     FUNCTION cxios_is_defined_gridgroup_axis_domain_order(gridgroup_hdl) BIND(C) 
    27       USE ISO_C_BINDING 
    28       LOGICAL(kind=C_BOOL) :: cxios_is_defined_gridgroup_axis_domain_order 
    29       INTEGER (kind = C_INTPTR_T), VALUE :: gridgroup_hdl 
    30     END FUNCTION cxios_is_defined_gridgroup_axis_domain_order 
    31  
    3211 
    3312    SUBROUTINE cxios_set_gridgroup_description(gridgroup_hdl, description, description_size) BIND(C) 

  • 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) 

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

    r674 r791  
    1212 
    1313  SUBROUTINE xios(set_gridgroup_attr)  & 
    14     ( gridgroup_id, axis_domain_order, description, group_ref, mask1, mask2, mask3, name ) 
     14    ( gridgroup_id, description, group_ref, mask1, mask2, mask3, name ) 
    1515 
    1616    IMPLICIT NONE 
    1717      TYPE(txios(gridgroup))  :: gridgroup_hdl 
    1818      CHARACTER(LEN=*), INTENT(IN) ::gridgroup_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      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref 
    … …  
    3129      CALL xios(get_gridgroup_handle)(gridgroup_id,gridgroup_hdl) 
    3230      CALL xios(set_gridgroup_attr_hdl_)   & 
    33       ( gridgroup_hdl, axis_domain_order, description, group_ref, mask1, mask2, mask3, name ) 
     31      ( gridgroup_hdl, description, group_ref, mask1, mask2, mask3, name ) 
    3432 
    3533  END SUBROUTINE xios(set_gridgroup_attr) 
    3634 
    3735  SUBROUTINE xios(set_gridgroup_attr_hdl)  & 
    38     ( gridgroup_hdl, axis_domain_order, description, group_ref, mask1, mask2, mask3, name ) 
    39  
    40     IMPLICIT NONE 
    41       TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    42       LOGICAL  , OPTIONAL, INTENT(IN) :: axis_domain_order(:) 
    43       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axis_domain_order_tmp(:) 
     36    ( gridgroup_hdl, description, group_ref, mask1, mask2, mask3, name ) 
     37 
     38    IMPLICIT NONE 
     39      TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    4440      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description 
    4541      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref 
    … …  
    5349 
    5450      CALL xios(set_gridgroup_attr_hdl_)  & 
    55       ( gridgroup_hdl, axis_domain_order, description, group_ref, mask1, mask2, mask3, name ) 
     51      ( gridgroup_hdl, description, group_ref, mask1, mask2, mask3, name ) 
    5652 
    5753  END SUBROUTINE xios(set_gridgroup_attr_hdl) 
    5854 
    5955  SUBROUTINE xios(set_gridgroup_attr_hdl_)   & 
    60     ( gridgroup_hdl, axis_domain_order_, description_, group_ref_, mask1_, mask2_, mask3_, name_  & 
    61      ) 
    62  
    63     IMPLICIT NONE 
    64       TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    65       LOGICAL  , OPTIONAL, INTENT(IN) :: axis_domain_order_(:) 
    66       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axis_domain_order__tmp(:) 
     56    ( gridgroup_hdl, description_, group_ref_, mask1_, mask2_, mask3_, name_ ) 
     57 
     58    IMPLICIT NONE 
     59      TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    6760      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description_ 
    6861      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref_ 
    … …  
    7568      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name_ 
    7669 
    77       IF (PRESENT(axis_domain_order_)) THEN 
    78         ALLOCATE(axis_domain_order__tmp(SIZE(axis_domain_order_,1))) 
    79         axis_domain_order__tmp = axis_domain_order_ 
    80         CALL cxios_set_gridgroup_axis_domain_order(gridgroup_hdl%daddr, axis_domain_order__tmp, SHAPE(axis_domain_order_)) 
    81       ENDIF 
    82  
    8370      IF (PRESENT(description_)) THEN 
    8471        CALL cxios_set_gridgroup_description(gridgroup_hdl%daddr, description_, len(description_)) 
    … …  
    114101 
    115102  SUBROUTINE xios(get_gridgroup_attr)  & 
    116     ( gridgroup_id, axis_domain_order, description, group_ref, mask1, mask2, mask3, name ) 
     103    ( gridgroup_id, description, group_ref, mask1, mask2, mask3, name ) 
    117104 
    118105    IMPLICIT NONE 
    119106      TYPE(txios(gridgroup))  :: gridgroup_hdl 
    120107      CHARACTER(LEN=*), INTENT(IN) ::gridgroup_id 
    121       LOGICAL  , OPTIONAL, INTENT(OUT) :: axis_domain_order(:) 
    122       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axis_domain_order_tmp(:) 
    123108      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description 
    124109      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref 
    … …  
    133118      CALL xios(get_gridgroup_handle)(gridgroup_id,gridgroup_hdl) 
    134119      CALL xios(get_gridgroup_attr_hdl_)   & 
    135       ( gridgroup_hdl, axis_domain_order, description, group_ref, mask1, mask2, mask3, name ) 
     120      ( gridgroup_hdl, description, group_ref, mask1, mask2, mask3, name ) 
    136121 
    137122  END SUBROUTINE xios(get_gridgroup_attr) 
    138123 
    139124  SUBROUTINE xios(get_gridgroup_attr_hdl)  & 
    140     ( gridgroup_hdl, axis_domain_order, description, group_ref, mask1, mask2, mask3, name ) 
    141  
    142     IMPLICIT NONE 
    143       TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    144       LOGICAL  , OPTIONAL, INTENT(OUT) :: axis_domain_order(:) 
    145       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axis_domain_order_tmp(:) 
     125    ( gridgroup_hdl, description, group_ref, mask1, mask2, mask3, name ) 
     126 
     127    IMPLICIT NONE 
     128      TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    146129      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description 
    147130      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref 
    … …  
    155138 
    156139      CALL xios(get_gridgroup_attr_hdl_)  & 
    157       ( gridgroup_hdl, axis_domain_order, description, group_ref, mask1, mask2, mask3, name ) 
     140      ( gridgroup_hdl, description, group_ref, mask1, mask2, mask3, name ) 
    158141 
    159142  END SUBROUTINE xios(get_gridgroup_attr_hdl) 
    160143 
    161144  SUBROUTINE xios(get_gridgroup_attr_hdl_)   & 
    162     ( gridgroup_hdl, axis_domain_order_, description_, group_ref_, mask1_, mask2_, mask3_, name_  & 
    163      ) 
    164  
    165     IMPLICIT NONE 
    166       TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    167       LOGICAL  , OPTIONAL, INTENT(OUT) :: axis_domain_order_(:) 
    168       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axis_domain_order__tmp(:) 
     145    ( gridgroup_hdl, description_, group_ref_, mask1_, mask2_, mask3_, name_ ) 
     146 
     147    IMPLICIT NONE 
     148      TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    169149      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description_ 
    170150      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref_ 
    … …  
    177157      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name_ 
    178158 
    179       IF (PRESENT(axis_domain_order_)) THEN 
    180         ALLOCATE(axis_domain_order__tmp(SIZE(axis_domain_order_,1))) 
    181         CALL cxios_get_gridgroup_axis_domain_order(gridgroup_hdl%daddr, axis_domain_order__tmp, SHAPE(axis_domain_order_)) 
    182         axis_domain_order_ = axis_domain_order__tmp 
    183       ENDIF 
    184  
    185159      IF (PRESENT(description_)) THEN 
    186160        CALL cxios_get_gridgroup_description(gridgroup_hdl%daddr, description_, len(description_)) 
    … …  
    216190 
    217191  SUBROUTINE xios(is_defined_gridgroup_attr)  & 
    218     ( gridgroup_id, axis_domain_order, description, group_ref, mask1, mask2, mask3, name ) 
     192    ( gridgroup_id, description, group_ref, mask1, mask2, mask3, name ) 
    219193 
    220194    IMPLICIT NONE 
    221195      TYPE(txios(gridgroup))  :: gridgroup_hdl 
    222196      CHARACTER(LEN=*), INTENT(IN) ::gridgroup_id 
    223       LOGICAL, OPTIONAL, INTENT(OUT) :: axis_domain_order 
    224       LOGICAL(KIND=C_BOOL) :: axis_domain_order_tmp 
    225197      LOGICAL, OPTIONAL, INTENT(OUT) :: description 
    226198      LOGICAL(KIND=C_BOOL) :: description_tmp 
    … …  
    238210      CALL xios(get_gridgroup_handle)(gridgroup_id,gridgroup_hdl) 
    239211      CALL xios(is_defined_gridgroup_attr_hdl_)   & 
    240       ( gridgroup_hdl, axis_domain_order, description, group_ref, mask1, mask2, mask3, name ) 
     212      ( gridgroup_hdl, description, group_ref, mask1, mask2, mask3, name ) 
    241213 
    242214  END SUBROUTINE xios(is_defined_gridgroup_attr) 
    243215 
    244216  SUBROUTINE xios(is_defined_gridgroup_attr_hdl)  & 
    245     ( gridgroup_hdl, axis_domain_order, description, group_ref, mask1, mask2, mask3, name ) 
    246  
    247     IMPLICIT NONE 
    248       TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    249       LOGICAL, OPTIONAL, INTENT(OUT) :: axis_domain_order 
    250       LOGICAL(KIND=C_BOOL) :: axis_domain_order_tmp 
     217    ( gridgroup_hdl, description, group_ref, mask1, mask2, mask3, name ) 
     218 
     219    IMPLICIT NONE 
     220      TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    251221      LOGICAL, OPTIONAL, INTENT(OUT) :: description 
    252222      LOGICAL(KIND=C_BOOL) :: description_tmp 
    … …  
    263233 
    264234      CALL xios(is_defined_gridgroup_attr_hdl_)  & 
    265       ( gridgroup_hdl, axis_domain_order, description, group_ref, mask1, mask2, mask3, name ) 
     235      ( gridgroup_hdl, description, group_ref, mask1, mask2, mask3, name ) 
    266236 
    267237  END SUBROUTINE xios(is_defined_gridgroup_attr_hdl) 
    268238 
    269239  SUBROUTINE xios(is_defined_gridgroup_attr_hdl_)   & 
    270     ( gridgroup_hdl, axis_domain_order_, description_, group_ref_, mask1_, mask2_, mask3_, name_  & 
    271      ) 
    272  
    273     IMPLICIT NONE 
    274       TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    275       LOGICAL, OPTIONAL, INTENT(OUT) :: axis_domain_order_ 
    276       LOGICAL(KIND=C_BOOL) :: axis_domain_order__tmp 
     240    ( gridgroup_hdl, description_, group_ref_, mask1_, mask2_, mask3_, name_ ) 
     241 
     242    IMPLICIT NONE 
     243      TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    277244      LOGICAL, OPTIONAL, INTENT(OUT) :: description_ 
    278245      LOGICAL(KIND=C_BOOL) :: description__tmp 
    … …  
    288255      LOGICAL(KIND=C_BOOL) :: name__tmp 
    289256 
    290       IF (PRESENT(axis_domain_order_)) THEN 
    291         axis_domain_order__tmp = cxios_is_defined_gridgroup_axis_domain_order(gridgroup_hdl%daddr) 
    292         axis_domain_order_ = axis_domain_order__tmp 
    293       ENDIF 
    294  
    295257      IF (PRESENT(description_)) THEN 
    296258        description__tmp = cxios_is_defined_gridgroup_description(gridgroup_hdl%daddr) 
Note: See TracChangeset for help on using the changeset viewer.