Changeset 575


Ignore:
Timestamp:
03/13/15 14:34:26 (6 years ago)
Author:
rlacroix
Message:

Rename axisDomainOrder attribute to axis_domain_order.

"Snake case" is used everywhere else and camel case seems to confuse PGI compilers.

Location:
XIOS/trunk/src
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/src/config/grid_attribute.conf

    r567 r575  
    1313// These attributes should be used privately 
    1414// An array contains order of axis and domains composing of the grid 
    15 DECLARE_ARRAY(bool, 1 , axisDomainOrder) 
     15DECLARE_ARRAY(bool, 1 , axis_domain_order) 
  • XIOS/trunk/src/interface/c_attr/icgrid_attr.cpp

    r567 r575  
    1818  typedef xios::CGrid*  grid_Ptr; 
    1919   
    20   void cxios_set_grid_axisDomainOrder(grid_Ptr grid_hdl, bool* axisDomainOrder, int extent1) 
     20  void cxios_set_grid_axis_domain_order(grid_Ptr grid_hdl, bool* axis_domain_order, int extent1) 
    2121  { 
    2222    CTimer::get("XIOS").resume(); 
    23     CArray<bool,1> tmp(axisDomainOrder,shape(extent1),neverDeleteData) ; 
    24     grid_hdl->axisDomainOrder.reference(tmp.copy()); 
     23    CArray<bool,1> tmp(axis_domain_order,shape(extent1),neverDeleteData) ; 
     24    grid_hdl->axis_domain_order.reference(tmp.copy()); 
    2525     CTimer::get("XIOS").suspend(); 
    2626  } 
    2727   
    28   void cxios_get_grid_axisDomainOrder(grid_Ptr grid_hdl, bool* axisDomainOrder, int extent1) 
     28  void cxios_get_grid_axis_domain_order(grid_Ptr grid_hdl, bool* axis_domain_order, int extent1) 
    2929  { 
    3030    CTimer::get("XIOS").resume(); 
    31     CArray<bool,1> tmp(axisDomainOrder,shape(extent1),neverDeleteData) ; 
    32     tmp=grid_hdl->axisDomainOrder.getInheritedValue() ; 
     31    CArray<bool,1> tmp(axis_domain_order,shape(extent1),neverDeleteData) ; 
     32    tmp=grid_hdl->axis_domain_order.getInheritedValue() ; 
    3333     CTimer::get("XIOS").suspend(); 
    3434  } 
    3535   
    36   bool cxios_is_defined_grid_axisDomainOrder(grid_Ptr grid_hdl ) 
     36  bool cxios_is_defined_grid_axis_domain_order(grid_Ptr grid_hdl ) 
    3737  { 
    3838     CTimer::get("XIOS").resume(); 
    39     return grid_hdl->axisDomainOrder.hasInheritedValue(); 
     39    return grid_hdl->axis_domain_order.hasInheritedValue(); 
    4040     CTimer::get("XIOS").suspend(); 
    4141  } 
  • XIOS/trunk/src/interface/c_attr/icgridgroup_attr.cpp

    r567 r575  
    1818  typedef xios::CGridGroup*  gridgroup_Ptr; 
    1919   
    20   void cxios_set_gridgroup_axisDomainOrder(gridgroup_Ptr gridgroup_hdl, bool* axisDomainOrder, int extent1) 
     20  void cxios_set_gridgroup_axis_domain_order(gridgroup_Ptr gridgroup_hdl, bool* axis_domain_order, int extent1) 
    2121  { 
    2222    CTimer::get("XIOS").resume(); 
    23     CArray<bool,1> tmp(axisDomainOrder,shape(extent1),neverDeleteData) ; 
    24     gridgroup_hdl->axisDomainOrder.reference(tmp.copy()); 
     23    CArray<bool,1> tmp(axis_domain_order,shape(extent1),neverDeleteData) ; 
     24    gridgroup_hdl->axis_domain_order.reference(tmp.copy()); 
    2525     CTimer::get("XIOS").suspend(); 
    2626  } 
    2727   
    28   void cxios_get_gridgroup_axisDomainOrder(gridgroup_Ptr gridgroup_hdl, bool* axisDomainOrder, int extent1) 
     28  void cxios_get_gridgroup_axis_domain_order(gridgroup_Ptr gridgroup_hdl, bool* axis_domain_order, int extent1) 
    2929  { 
    3030    CTimer::get("XIOS").resume(); 
    31     CArray<bool,1> tmp(axisDomainOrder,shape(extent1),neverDeleteData) ; 
    32     tmp=gridgroup_hdl->axisDomainOrder.getInheritedValue() ; 
     31    CArray<bool,1> tmp(axis_domain_order,shape(extent1),neverDeleteData) ; 
     32    tmp=gridgroup_hdl->axis_domain_order.getInheritedValue() ; 
    3333     CTimer::get("XIOS").suspend(); 
    3434  } 
    3535   
    36   bool cxios_is_defined_gridgroup_axisDomainOrder(gridgroup_Ptr gridgroup_hdl ) 
     36  bool cxios_is_defined_gridgroup_axis_domain_order(gridgroup_Ptr gridgroup_hdl ) 
    3737  { 
    3838     CTimer::get("XIOS").resume(); 
    39     return gridgroup_hdl->axisDomainOrder.hasInheritedValue(); 
     39    return gridgroup_hdl->axis_domain_order.hasInheritedValue(); 
    4040     CTimer::get("XIOS").suspend(); 
    4141  } 
  • XIOS/trunk/src/interface/fortran_attr/grid_interface_attr.F90

    r567 r575  
    1010     
    1111     
    12     SUBROUTINE cxios_set_grid_axisDomainOrder(grid_hdl, axisDomainOrder, extent1) BIND(C) 
     12    SUBROUTINE cxios_set_grid_axis_domain_order(grid_hdl, axis_domain_order, extent1) BIND(C) 
    1313      USE ISO_C_BINDING 
    1414      INTEGER (kind = C_INTPTR_T), VALUE       :: grid_hdl 
    15       LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: axisDomainOrder 
     15      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: axis_domain_order 
    1616      INTEGER (kind = C_INT), VALUE  :: extent1 
    17     END SUBROUTINE cxios_set_grid_axisDomainOrder 
     17    END SUBROUTINE cxios_set_grid_axis_domain_order 
    1818     
    19     SUBROUTINE cxios_get_grid_axisDomainOrder(grid_hdl, axisDomainOrder, extent1) BIND(C) 
     19    SUBROUTINE cxios_get_grid_axis_domain_order(grid_hdl, axis_domain_order, extent1) BIND(C) 
    2020      USE ISO_C_BINDING 
    2121      INTEGER (kind = C_INTPTR_T), VALUE       :: grid_hdl 
    22       LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: axisDomainOrder 
     22      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: axis_domain_order 
    2323      INTEGER (kind = C_INT), VALUE  :: extent1 
    24     END SUBROUTINE cxios_get_grid_axisDomainOrder 
     24    END SUBROUTINE cxios_get_grid_axis_domain_order 
    2525     
    26     FUNCTION cxios_is_defined_grid_axisDomainOrder(grid_hdl ) BIND(C) 
     26    FUNCTION cxios_is_defined_grid_axis_domain_order(grid_hdl ) BIND(C) 
    2727      USE ISO_C_BINDING 
    28       LOGICAL(kind=C_BOOL) :: cxios_is_defined_grid_axisDomainOrder 
     28      LOGICAL(kind=C_BOOL) :: cxios_is_defined_grid_axis_domain_order 
    2929      INTEGER (kind = C_INTPTR_T), VALUE :: grid_hdl 
    30     END FUNCTION cxios_is_defined_grid_axisDomainOrder 
     30    END FUNCTION cxios_is_defined_grid_axis_domain_order 
    3131     
    3232     
  • XIOS/trunk/src/interface/fortran_attr/gridgroup_interface_attr.F90

    r567 r575  
    1010     
    1111     
    12     SUBROUTINE cxios_set_gridgroup_axisDomainOrder(gridgroup_hdl, axisDomainOrder, extent1) BIND(C) 
     12    SUBROUTINE cxios_set_gridgroup_axis_domain_order(gridgroup_hdl, axis_domain_order, extent1) BIND(C) 
    1313      USE ISO_C_BINDING 
    1414      INTEGER (kind = C_INTPTR_T), VALUE       :: gridgroup_hdl 
    15       LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: axisDomainOrder 
     15      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: axis_domain_order 
    1616      INTEGER (kind = C_INT), VALUE  :: extent1 
    17     END SUBROUTINE cxios_set_gridgroup_axisDomainOrder 
     17    END SUBROUTINE cxios_set_gridgroup_axis_domain_order 
    1818     
    19     SUBROUTINE cxios_get_gridgroup_axisDomainOrder(gridgroup_hdl, axisDomainOrder, extent1) BIND(C) 
     19    SUBROUTINE cxios_get_gridgroup_axis_domain_order(gridgroup_hdl, axis_domain_order, extent1) BIND(C) 
    2020      USE ISO_C_BINDING 
    2121      INTEGER (kind = C_INTPTR_T), VALUE       :: gridgroup_hdl 
    22       LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: axisDomainOrder 
     22      LOGICAL (KIND=C_BOOL)     , DIMENSION(*) :: axis_domain_order 
    2323      INTEGER (kind = C_INT), VALUE  :: extent1 
    24     END SUBROUTINE cxios_get_gridgroup_axisDomainOrder 
     24    END SUBROUTINE cxios_get_gridgroup_axis_domain_order 
    2525     
    26     FUNCTION cxios_is_defined_gridgroup_axisDomainOrder(gridgroup_hdl ) BIND(C) 
     26    FUNCTION cxios_is_defined_gridgroup_axis_domain_order(gridgroup_hdl ) BIND(C) 
    2727      USE ISO_C_BINDING 
    28       LOGICAL(kind=C_BOOL) :: cxios_is_defined_gridgroup_axisDomainOrder 
     28      LOGICAL(kind=C_BOOL) :: cxios_is_defined_gridgroup_axis_domain_order 
    2929      INTEGER (kind = C_INTPTR_T), VALUE :: gridgroup_hdl 
    30     END FUNCTION cxios_is_defined_gridgroup_axisDomainOrder 
     30    END FUNCTION cxios_is_defined_gridgroup_axis_domain_order 
    3131     
    3232     
  • XIOS/trunk/src/interface/fortran_attr/igrid_attr.F90

    r567 r575  
    1212   
    1313  SUBROUTINE xios(set_grid_attr)  & 
    14     ( grid_id, axisDomainOrder, description, mask1, mask2, mask3, name ) 
     14    ( grid_id, axis_domain_order, 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) :: axisDomainOrder(:) 
    20       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder_tmp(:) 
     19      LOGICAL  , OPTIONAL, INTENT(IN) :: axis_domain_order(:) 
     20      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axis_domain_order_tmp(:) 
    2121      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description 
    2222      LOGICAL  , OPTIONAL, INTENT(IN) :: mask1(:) 
     
    3030      CALL xios(get_grid_handle)(grid_id,grid_hdl) 
    3131      CALL xios(set_grid_attr_hdl_)   & 
    32       ( grid_hdl, axisDomainOrder, description, mask1, mask2, mask3, name ) 
     32      ( grid_hdl, axis_domain_order, description, mask1, mask2, mask3, name ) 
    3333     
    3434  END SUBROUTINE xios(set_grid_attr) 
    3535   
    3636  SUBROUTINE xios(set_grid_attr_hdl)  & 
    37     ( grid_hdl, axisDomainOrder, description, mask1, mask2, mask3, name ) 
    38      
    39     IMPLICIT NONE 
    40       TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    41       LOGICAL  , OPTIONAL, INTENT(IN) :: axisDomainOrder(:) 
    42       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder_tmp(:) 
     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(:) 
    4343      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description 
    4444      LOGICAL  , OPTIONAL, INTENT(IN) :: mask1(:) 
     
    5151       
    5252      CALL xios(set_grid_attr_hdl_)  & 
    53       ( grid_hdl, axisDomainOrder, description, mask1, mask2, mask3, name ) 
     53      ( grid_hdl, axis_domain_order, description, mask1, mask2, mask3, name ) 
    5454     
    5555  END SUBROUTINE xios(set_grid_attr_hdl) 
    5656   
    5757  SUBROUTINE xios(set_grid_attr_hdl_)   & 
    58     ( grid_hdl, axisDomainOrder_, description_, mask1_, mask2_, mask3_, name_ ) 
    59      
    60     IMPLICIT NONE 
    61       TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    62       LOGICAL  , OPTIONAL, INTENT(IN) :: axisDomainOrder_(:) 
    63       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder__tmp(:) 
     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(:) 
    6464      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description_ 
    6565      LOGICAL  , OPTIONAL, INTENT(IN) :: mask1_(:) 
     
    7171      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name_ 
    7272       
    73       IF (PRESENT(axisDomainOrder_)) THEN 
    74         ALLOCATE(axisDomainOrder__tmp(size(axisDomainOrder_,1))) 
    75         axisDomainOrder__tmp=axisDomainOrder_ 
    76         CALL cxios_set_grid_axisDomainOrder(grid_hdl%daddr, axisDomainOrder__tmp,size(axisDomainOrder_,1)) 
     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,size(axis_domain_order_,1)) 
    7777      ENDIF 
    7878       
     
    108108   
    109109  SUBROUTINE xios(get_grid_attr)  & 
    110     ( grid_id, axisDomainOrder, description, mask1, mask2, mask3, name ) 
     110    ( grid_id, axis_domain_order, description, mask1, mask2, mask3, name ) 
    111111     
    112112    IMPLICIT NONE 
    113113      TYPE(txios(grid))  :: grid_hdl 
    114114      CHARACTER(LEN=*), INTENT(IN) ::grid_id 
    115       LOGICAL  , OPTIONAL, INTENT(OUT) :: axisDomainOrder(:) 
    116       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder_tmp(:) 
     115      LOGICAL  , OPTIONAL, INTENT(OUT) :: axis_domain_order(:) 
     116      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axis_domain_order_tmp(:) 
    117117      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description 
    118118      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask1(:) 
     
    126126      CALL xios(get_grid_handle)(grid_id,grid_hdl) 
    127127      CALL xios(get_grid_attr_hdl_)   & 
    128       ( grid_hdl, axisDomainOrder, description, mask1, mask2, mask3, name ) 
     128      ( grid_hdl, axis_domain_order, description, mask1, mask2, mask3, name ) 
    129129     
    130130  END SUBROUTINE xios(get_grid_attr) 
    131131   
    132132  SUBROUTINE xios(get_grid_attr_hdl)  & 
    133     ( grid_hdl, axisDomainOrder, description, mask1, mask2, mask3, name ) 
    134      
    135     IMPLICIT NONE 
    136       TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    137       LOGICAL  , OPTIONAL, INTENT(OUT) :: axisDomainOrder(:) 
    138       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder_tmp(:) 
     133    ( grid_hdl, axis_domain_order, description, mask1, mask2, mask3, name ) 
     134     
     135    IMPLICIT NONE 
     136      TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
     137      LOGICAL  , OPTIONAL, INTENT(OUT) :: axis_domain_order(:) 
     138      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axis_domain_order_tmp(:) 
    139139      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description 
    140140      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask1(:) 
     
    147147       
    148148      CALL xios(get_grid_attr_hdl_)  & 
    149       ( grid_hdl, axisDomainOrder, description, mask1, mask2, mask3, name ) 
     149      ( grid_hdl, axis_domain_order, description, mask1, mask2, mask3, name ) 
    150150     
    151151  END SUBROUTINE xios(get_grid_attr_hdl) 
    152152   
    153153  SUBROUTINE xios(get_grid_attr_hdl_)   & 
    154     ( grid_hdl, axisDomainOrder_, description_, mask1_, mask2_, mask3_, name_ ) 
    155      
    156     IMPLICIT NONE 
    157       TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    158       LOGICAL  , OPTIONAL, INTENT(OUT) :: axisDomainOrder_(:) 
    159       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder__tmp(:) 
     154    ( grid_hdl, axis_domain_order_, description_, mask1_, mask2_, mask3_, name_ ) 
     155     
     156    IMPLICIT NONE 
     157      TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
     158      LOGICAL  , OPTIONAL, INTENT(OUT) :: axis_domain_order_(:) 
     159      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axis_domain_order__tmp(:) 
    160160      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description_ 
    161161      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask1_(:) 
     
    167167      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name_ 
    168168       
    169       IF (PRESENT(axisDomainOrder_)) THEN 
    170         ALLOCATE(axisDomainOrder__tmp(size(axisDomainOrder_,1))) 
    171         CALL cxios_get_grid_axisDomainOrder(grid_hdl%daddr, axisDomainOrder__tmp,size(axisDomainOrder_,1)) 
    172         axisDomainOrder_=axisDomainOrder__tmp 
     169      IF (PRESENT(axis_domain_order_)) THEN 
     170        ALLOCATE(axis_domain_order__tmp(size(axis_domain_order_,1))) 
     171        CALL cxios_get_grid_axis_domain_order(grid_hdl%daddr, axis_domain_order__tmp,size(axis_domain_order_,1)) 
     172        axis_domain_order_=axis_domain_order__tmp 
    173173      ENDIF 
    174174       
     
    204204   
    205205  SUBROUTINE xios(is_defined_grid_attr)  & 
    206     ( grid_id, axisDomainOrder, description, mask1, mask2, mask3, name ) 
     206    ( grid_id, axis_domain_order, description, mask1, mask2, mask3, name ) 
    207207     
    208208    IMPLICIT NONE 
    209209      TYPE(txios(grid))  :: grid_hdl 
    210210      CHARACTER(LEN=*), INTENT(IN) ::grid_id 
    211       LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomainOrder 
    212       LOGICAL(KIND=C_BOOL) :: axisDomainOrder_tmp 
     211      LOGICAL, OPTIONAL, INTENT(OUT) :: axis_domain_order 
     212      LOGICAL(KIND=C_BOOL) :: axis_domain_order_tmp 
    213213      LOGICAL, OPTIONAL, INTENT(OUT) :: description 
    214214      LOGICAL(KIND=C_BOOL) :: description_tmp 
     
    224224      CALL xios(get_grid_handle)(grid_id,grid_hdl) 
    225225      CALL xios(is_defined_grid_attr_hdl_)   & 
    226       ( grid_hdl, axisDomainOrder, description, mask1, mask2, mask3, name ) 
     226      ( grid_hdl, axis_domain_order, description, mask1, mask2, mask3, name ) 
    227227     
    228228  END SUBROUTINE xios(is_defined_grid_attr) 
    229229   
    230230  SUBROUTINE xios(is_defined_grid_attr_hdl)  & 
    231     ( grid_hdl, axisDomainOrder, description, mask1, mask2, mask3, name ) 
    232      
    233     IMPLICIT NONE 
    234       TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    235       LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomainOrder 
    236       LOGICAL(KIND=C_BOOL) :: axisDomainOrder_tmp 
     231    ( grid_hdl, axis_domain_order, description, mask1, mask2, mask3, name ) 
     232     
     233    IMPLICIT NONE 
     234      TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
     235      LOGICAL, OPTIONAL, INTENT(OUT) :: axis_domain_order 
     236      LOGICAL(KIND=C_BOOL) :: axis_domain_order_tmp 
    237237      LOGICAL, OPTIONAL, INTENT(OUT) :: description 
    238238      LOGICAL(KIND=C_BOOL) :: description_tmp 
     
    247247       
    248248      CALL xios(is_defined_grid_attr_hdl_)  & 
    249       ( grid_hdl, axisDomainOrder, description, mask1, mask2, mask3, name ) 
     249      ( grid_hdl, axis_domain_order, description, mask1, mask2, mask3, name ) 
    250250     
    251251  END SUBROUTINE xios(is_defined_grid_attr_hdl) 
    252252   
    253253  SUBROUTINE xios(is_defined_grid_attr_hdl_)   & 
    254     ( grid_hdl, axisDomainOrder_, description_, mask1_, mask2_, mask3_, name_ ) 
    255      
    256     IMPLICIT NONE 
    257       TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    258       LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomainOrder_ 
    259       LOGICAL(KIND=C_BOOL) :: axisDomainOrder__tmp 
     254    ( grid_hdl, axis_domain_order_, description_, mask1_, mask2_, mask3_, name_ ) 
     255     
     256    IMPLICIT NONE 
     257      TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
     258      LOGICAL, OPTIONAL, INTENT(OUT) :: axis_domain_order_ 
     259      LOGICAL(KIND=C_BOOL) :: axis_domain_order__tmp 
    260260      LOGICAL, OPTIONAL, INTENT(OUT) :: description_ 
    261261      LOGICAL(KIND=C_BOOL) :: description__tmp 
     
    269269      LOGICAL(KIND=C_BOOL) :: name__tmp 
    270270       
    271       IF (PRESENT(axisDomainOrder_)) THEN 
    272         axisDomainOrder__tmp=cxios_is_defined_grid_axisDomainOrder(grid_hdl%daddr) 
    273         axisDomainOrder_=axisDomainOrder__tmp 
     271      IF (PRESENT(axis_domain_order_)) THEN 
     272        axis_domain_order__tmp=cxios_is_defined_grid_axis_domain_order(grid_hdl%daddr) 
     273        axis_domain_order_=axis_domain_order__tmp 
    274274      ENDIF 
    275275       
  • XIOS/trunk/src/interface/fortran_attr/igridgroup_attr.F90

    r567 r575  
    1212   
    1313  SUBROUTINE xios(set_gridgroup_attr)  & 
    14     ( gridgroup_id, axisDomainOrder, description, group_ref, mask1, mask2, mask3, name ) 
     14    ( gridgroup_id, axis_domain_order, 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) :: axisDomainOrder(:) 
    20       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder_tmp(:) 
     19      LOGICAL  , OPTIONAL, INTENT(IN) :: axis_domain_order(:) 
     20      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axis_domain_order_tmp(:) 
    2121      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description 
    2222      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref 
     
    3131      CALL xios(get_gridgroup_handle)(gridgroup_id,gridgroup_hdl) 
    3232      CALL xios(set_gridgroup_attr_hdl_)   & 
    33       ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask1, mask2, mask3, name ) 
     33      ( gridgroup_hdl, axis_domain_order, description, group_ref, mask1, mask2, mask3, name ) 
    3434     
    3535  END SUBROUTINE xios(set_gridgroup_attr) 
    3636   
    3737  SUBROUTINE xios(set_gridgroup_attr_hdl)  & 
    38     ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask1, mask2, mask3, name ) 
    39      
    40     IMPLICIT NONE 
    41       TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    42       LOGICAL  , OPTIONAL, INTENT(IN) :: axisDomainOrder(:) 
    43       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder_tmp(:) 
     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(:) 
    4444      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description 
    4545      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref 
     
    5353       
    5454      CALL xios(set_gridgroup_attr_hdl_)  & 
    55       ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask1, mask2, mask3, name ) 
     55      ( gridgroup_hdl, axis_domain_order, description, group_ref, mask1, mask2, mask3, name ) 
    5656     
    5757  END SUBROUTINE xios(set_gridgroup_attr_hdl) 
    5858   
    5959  SUBROUTINE xios(set_gridgroup_attr_hdl_)   & 
    60     ( gridgroup_hdl, axisDomainOrder_, description_, group_ref_, mask1_, mask2_, mask3_, name_ ) 
    61      
    62     IMPLICIT NONE 
    63       TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    64       LOGICAL  , OPTIONAL, INTENT(IN) :: axisDomainOrder_(:) 
    65       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder__tmp(:) 
     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(:) 
    6667      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description_ 
    6768      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref_ 
     
    7475      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name_ 
    7576       
    76       IF (PRESENT(axisDomainOrder_)) THEN 
    77         ALLOCATE(axisDomainOrder__tmp(size(axisDomainOrder_,1))) 
    78         axisDomainOrder__tmp=axisDomainOrder_ 
    79         CALL cxios_set_gridgroup_axisDomainOrder(gridgroup_hdl%daddr, axisDomainOrder__tmp,size(axisDomainOrder_,1)) 
     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,size(axis_domain_order_,1)) 
    8081      ENDIF 
    8182       
     
    115116   
    116117  SUBROUTINE xios(get_gridgroup_attr)  & 
    117     ( gridgroup_id, axisDomainOrder, description, group_ref, mask1, mask2, mask3, name ) 
     118    ( gridgroup_id, axis_domain_order, description, group_ref, mask1, mask2, mask3, name ) 
    118119     
    119120    IMPLICIT NONE 
    120121      TYPE(txios(gridgroup))  :: gridgroup_hdl 
    121122      CHARACTER(LEN=*), INTENT(IN) ::gridgroup_id 
    122       LOGICAL  , OPTIONAL, INTENT(OUT) :: axisDomainOrder(:) 
    123       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder_tmp(:) 
     123      LOGICAL  , OPTIONAL, INTENT(OUT) :: axis_domain_order(:) 
     124      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axis_domain_order_tmp(:) 
    124125      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description 
    125126      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref 
     
    134135      CALL xios(get_gridgroup_handle)(gridgroup_id,gridgroup_hdl) 
    135136      CALL xios(get_gridgroup_attr_hdl_)   & 
    136       ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask1, mask2, mask3, name ) 
     137      ( gridgroup_hdl, axis_domain_order, description, group_ref, mask1, mask2, mask3, name ) 
    137138     
    138139  END SUBROUTINE xios(get_gridgroup_attr) 
    139140   
    140141  SUBROUTINE xios(get_gridgroup_attr_hdl)  & 
    141     ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask1, mask2, mask3, name ) 
    142      
    143     IMPLICIT NONE 
    144       TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    145       LOGICAL  , OPTIONAL, INTENT(OUT) :: axisDomainOrder(:) 
    146       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder_tmp(:) 
     142    ( gridgroup_hdl, axis_domain_order, description, group_ref, mask1, mask2, mask3, name ) 
     143     
     144    IMPLICIT NONE 
     145      TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
     146      LOGICAL  , OPTIONAL, INTENT(OUT) :: axis_domain_order(:) 
     147      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axis_domain_order_tmp(:) 
    147148      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description 
    148149      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref 
     
    156157       
    157158      CALL xios(get_gridgroup_attr_hdl_)  & 
    158       ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask1, mask2, mask3, name ) 
     159      ( gridgroup_hdl, axis_domain_order, description, group_ref, mask1, mask2, mask3, name ) 
    159160     
    160161  END SUBROUTINE xios(get_gridgroup_attr_hdl) 
    161162   
    162163  SUBROUTINE xios(get_gridgroup_attr_hdl_)   & 
    163     ( gridgroup_hdl, axisDomainOrder_, description_, group_ref_, mask1_, mask2_, mask3_, name_ ) 
    164      
    165     IMPLICIT NONE 
    166       TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    167       LOGICAL  , OPTIONAL, INTENT(OUT) :: axisDomainOrder_(:) 
    168       LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder__tmp(:) 
     164    ( gridgroup_hdl, axis_domain_order_, description_, group_ref_, mask1_, mask2_, mask3_, name_  & 
     165     ) 
     166     
     167    IMPLICIT NONE 
     168      TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
     169      LOGICAL  , OPTIONAL, INTENT(OUT) :: axis_domain_order_(:) 
     170      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axis_domain_order__tmp(:) 
    169171      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description_ 
    170172      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref_ 
     
    177179      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name_ 
    178180       
    179       IF (PRESENT(axisDomainOrder_)) THEN 
    180         ALLOCATE(axisDomainOrder__tmp(size(axisDomainOrder_,1))) 
    181         CALL cxios_get_gridgroup_axisDomainOrder(gridgroup_hdl%daddr, axisDomainOrder__tmp,size(axisDomainOrder_,1)) 
    182         axisDomainOrder_=axisDomainOrder__tmp 
     181      IF (PRESENT(axis_domain_order_)) THEN 
     182        ALLOCATE(axis_domain_order__tmp(size(axis_domain_order_,1))) 
     183        CALL cxios_get_gridgroup_axis_domain_order(gridgroup_hdl%daddr, axis_domain_order__tmp,size(axis_domain_order_,1)) 
     184        axis_domain_order_=axis_domain_order__tmp 
    183185      ENDIF 
    184186       
     
    218220   
    219221  SUBROUTINE xios(is_defined_gridgroup_attr)  & 
    220     ( gridgroup_id, axisDomainOrder, description, group_ref, mask1, mask2, mask3, name ) 
     222    ( gridgroup_id, axis_domain_order, description, group_ref, mask1, mask2, mask3, name ) 
    221223     
    222224    IMPLICIT NONE 
    223225      TYPE(txios(gridgroup))  :: gridgroup_hdl 
    224226      CHARACTER(LEN=*), INTENT(IN) ::gridgroup_id 
    225       LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomainOrder 
    226       LOGICAL(KIND=C_BOOL) :: axisDomainOrder_tmp 
     227      LOGICAL, OPTIONAL, INTENT(OUT) :: axis_domain_order 
     228      LOGICAL(KIND=C_BOOL) :: axis_domain_order_tmp 
    227229      LOGICAL, OPTIONAL, INTENT(OUT) :: description 
    228230      LOGICAL(KIND=C_BOOL) :: description_tmp 
     
    240242      CALL xios(get_gridgroup_handle)(gridgroup_id,gridgroup_hdl) 
    241243      CALL xios(is_defined_gridgroup_attr_hdl_)   & 
    242       ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask1, mask2, mask3, name ) 
     244      ( gridgroup_hdl, axis_domain_order, description, group_ref, mask1, mask2, mask3, name ) 
    243245     
    244246  END SUBROUTINE xios(is_defined_gridgroup_attr) 
    245247   
    246248  SUBROUTINE xios(is_defined_gridgroup_attr_hdl)  & 
    247     ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask1, mask2, mask3, name ) 
    248      
    249     IMPLICIT NONE 
    250       TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    251       LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomainOrder 
    252       LOGICAL(KIND=C_BOOL) :: axisDomainOrder_tmp 
     249    ( gridgroup_hdl, axis_domain_order, description, group_ref, mask1, mask2, mask3, name ) 
     250     
     251    IMPLICIT NONE 
     252      TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
     253      LOGICAL, OPTIONAL, INTENT(OUT) :: axis_domain_order 
     254      LOGICAL(KIND=C_BOOL) :: axis_domain_order_tmp 
    253255      LOGICAL, OPTIONAL, INTENT(OUT) :: description 
    254256      LOGICAL(KIND=C_BOOL) :: description_tmp 
     
    265267       
    266268      CALL xios(is_defined_gridgroup_attr_hdl_)  & 
    267       ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask1, mask2, mask3, name ) 
     269      ( gridgroup_hdl, axis_domain_order, description, group_ref, mask1, mask2, mask3, name ) 
    268270     
    269271  END SUBROUTINE xios(is_defined_gridgroup_attr_hdl) 
    270272   
    271273  SUBROUTINE xios(is_defined_gridgroup_attr_hdl_)   & 
    272     ( gridgroup_hdl, axisDomainOrder_, description_, group_ref_, mask1_, mask2_, mask3_, name_ ) 
    273      
    274     IMPLICIT NONE 
    275       TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    276       LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomainOrder_ 
    277       LOGICAL(KIND=C_BOOL) :: axisDomainOrder__tmp 
     274    ( gridgroup_hdl, axis_domain_order_, description_, group_ref_, mask1_, mask2_, mask3_, name_  & 
     275     ) 
     276     
     277    IMPLICIT NONE 
     278      TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
     279      LOGICAL, OPTIONAL, INTENT(OUT) :: axis_domain_order_ 
     280      LOGICAL(KIND=C_BOOL) :: axis_domain_order__tmp 
    278281      LOGICAL, OPTIONAL, INTENT(OUT) :: description_ 
    279282      LOGICAL(KIND=C_BOOL) :: description__tmp 
     
    289292      LOGICAL(KIND=C_BOOL) :: name__tmp 
    290293       
    291       IF (PRESENT(axisDomainOrder_)) THEN 
    292         axisDomainOrder__tmp=cxios_is_defined_gridgroup_axisDomainOrder(gridgroup_hdl%daddr) 
    293         axisDomainOrder_=axisDomainOrder__tmp 
     294      IF (PRESENT(axis_domain_order_)) THEN 
     295        axis_domain_order__tmp=cxios_is_defined_gridgroup_axis_domain_order(gridgroup_hdl%daddr) 
     296        axis_domain_order_=axis_domain_order__tmp 
    294297      ENDIF 
    295298       
  • XIOS/trunk/src/node/distribution_client.cpp

    r569 r575  
    4949  std::vector<CDomain*> domList = grid->getDomains(); 
    5050  std::vector<CAxis*> axisList = grid->getAxis(); 
    51   CArray<bool,1> axisDomainOrder = grid->axisDomainOrder; 
     51  CArray<bool,1> axisDomainOrder = grid->axis_domain_order; 
    5252 
    5353  std::vector<CDomain*>::iterator itbDom, iteDom, itDom; 
  • XIOS/trunk/src/node/grid.cpp

    r569 r575  
    231231      switch (dim) { 
    232232        case 1: 
    233           checkGridMask(mask1, domainMasks, axisMasks, axisDomainOrder); 
     233          checkGridMask(mask1, domainMasks, axisMasks, axis_domain_order); 
    234234          break; 
    235235        case 2: 
    236           checkGridMask(mask2, domainMasks, axisMasks, axisDomainOrder); 
     236          checkGridMask(mask2, domainMasks, axisMasks, axis_domain_order); 
    237237          break; 
    238238        case 3: 
    239           checkGridMask(mask3, domainMasks, axisMasks, axisDomainOrder); 
     239          checkGridMask(mask3, domainMasks, axisMasks, axis_domain_order); 
    240240          break; 
    241241//        case 4: 
    242 //          checkGridMask(mask4, domainMasks, axisMasks, axisDomainOrder); 
     242//          checkGridMask(mask4, domainMasks, axisMasks, axis_domain_order); 
    243243//          break; 
    244244//        case 5: 
    245 //          checkGridMask(mask5, domainMasks, axisMasks, axisDomainOrder); 
     245//          checkGridMask(mask5, domainMasks, axisMasks, axis_domain_order); 
    246246//          break; 
    247247//        case 6: 
    248 //          checkGridMask(mask6, domainMasks, axisMasks, axisDomainOrder); 
     248//          checkGridMask(mask6, domainMasks, axisMasks, axis_domain_order); 
    249249//          break; 
    250250//        case 7: 
    251 //          checkGridMask(mask7, domainMasks, axisMasks, axisDomainOrder); 
     251//          checkGridMask(mask7, domainMasks, axisMasks, axis_domain_order); 
    252252//          break; 
    253253        default: 
     
    263263      if (!domListP.empty()) 
    264264      { 
    265         computeGridGlobalDimension(getDomains(), getAxis(), axisDomainOrder); 
     265        computeGridGlobalDimension(getDomains(), getAxis(), axis_domain_order); 
    266266        for (int i = 0; i < domListP.size(); ++i) 
    267267        { 
     
    282282        int idx = 0; 
    283283        std::vector<int> axisPositionMap; 
    284         for (int i = 0; i < axisDomainOrder.numElements(); ++i) 
     284        for (int i = 0; i < axis_domain_order.numElements(); ++i) 
    285285        { 
    286           if (false == axisDomainOrder(i)) 
     286          if (false == axis_domain_order(i)) 
    287287          { 
    288288            axisPositionMap.push_back(idx); 
     
    292292        } 
    293293 
    294         computeGridGlobalDimension(getDomains(), getAxis(), axisDomainOrder); 
     294        computeGridGlobalDimension(getDomains(), getAxis(), axis_domain_order); 
    295295        for (int i = 0; i < axisListP.size(); ++i) 
    296296        { 
     
    385385 
    386386      //By default, domains are always the first ones of a grid 
    387       if (grid->axisDomainOrder.isEmpty()) 
     387      if (grid->axis_domain_order.isEmpty()) 
    388388      { 
    389389        int size = domains.size()+axis.size(); 
    390         grid->axisDomainOrder.resize(size); 
     390        grid->axis_domain_order.resize(size); 
    391391        for (int i = 0; i < size; ++i) 
    392392        { 
    393           if (i < domains.size()) grid->axisDomainOrder(i) = true; 
    394           else grid->axisDomainOrder(i) = false; 
     393          if (i < domains.size()) grid->axis_domain_order(i) = true; 
     394          else grid->axis_domain_order(i) = false; 
    395395        } 
    396396      } 
    397397 
    398       grid->computeGridGlobalDimension(domains, axis, grid->axisDomainOrder); 
     398      grid->computeGridGlobalDimension(domains, axis, grid->axis_domain_order); 
    399399 
    400400      return (grid); 
     
    586586       CContext* context = CContext::getCurrent() ; 
    587587       CContextServer* server=context->server ; 
    588        int idx = 0, numElement = axisDomainOrder.numElements(); 
     588       int idx = 0, numElement = axis_domain_order.numElements(); 
    589589       int ssize = numElement; 
    590590       std::vector<int> indexMap(numElement); 
     
    592592       { 
    593593         indexMap[i] = idx; 
    594          if (true == axisDomainOrder(i)) 
     594         if (true == axis_domain_order(i)) 
    595595         { 
    596596            ++ssize; 
     
    607607       for (int i = 0; i < numElement; ++i) 
    608608       { 
    609          if (axisDomainOrder(i)) 
     609         if (axis_domain_order(i)) 
    610610         { 
    611611            nZoomBegin[indexMap[i]]   = domainList[domainId]->zoom_ibegin_srv; 
     
    10181018    { 
    10191019      int sizeOrd = order.size(); 
    1020       axisDomainOrder.resize(sizeOrd); 
     1020      axis_domain_order.resize(sizeOrd); 
    10211021      for (int i = 0; i < sizeOrd; ++i) 
    10221022      { 
    1023         axisDomainOrder(i) = order[i]; 
     1023        axis_domain_order(i) = order[i]; 
    10241024      } 
    10251025    } 
  • XIOS/trunk/src/output/nc4_data_output.cpp

    r567 r575  
    583583          if (SuperClass::type==MULTI_FILE) return ; 
    584584 
    585          CArray<bool,1> axisDomainOrder = grid->axisDomainOrder; 
     585         CArray<bool,1> axisDomainOrder = grid->axis_domain_order; 
    586586         int numElement = axisDomainOrder.numElements(), idxDomain = 0, idxAxis = 0; 
    587587         std::vector<StdString> domainList = grid->getDomainList(); 
Note: See TracChangeset for help on using the changeset viewer.