Ignore:
Timestamp:
02/11/15 16:47:47 (9 years ago)
Author:
mhnguyen
Message:

Updating some Fortran interface files

+) Update some Fortran interface files generated by generate_fortran_interface.exe

Test
+) No test

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r546 r555  
    1212   
    1313  SUBROUTINE xios(set_gridgroup_attr)  & 
    14     ( gridgroup_id, axisDomOrder, description, group_ref, mask, name ) 
     14    ( gridgroup_id, axisDomainOrder, description, group_ref, mask, name ) 
    1515     
    1616    IMPLICIT NONE 
    1717      TYPE(txios(gridgroup))  :: gridgroup_hdl 
    1818      CHARACTER(LEN=*), INTENT(IN) ::gridgroup_id 
    19       INTEGER  , OPTIONAL, INTENT(IN) :: axisDomOrder(:) 
     19      LOGICAL  , OPTIONAL, INTENT(IN) :: axisDomainOrder(:) 
     20      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder_tmp(:) 
    2021      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description 
    2122      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref 
    … …  
    2627      CALL xios(get_gridgroup_handle)(gridgroup_id,gridgroup_hdl) 
    2728      CALL xios(set_gridgroup_attr_hdl_)   & 
    28       ( gridgroup_hdl, axisDomOrder, description, group_ref, mask, name ) 
     29      ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask, name ) 
    2930     
    3031  END SUBROUTINE xios(set_gridgroup_attr) 
    3132   
    3233  SUBROUTINE xios(set_gridgroup_attr_hdl)  & 
    33     ( gridgroup_hdl, axisDomOrder, description, group_ref, mask, name ) 
    34      
    35     IMPLICIT NONE 
    36       TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    37       INTEGER  , OPTIONAL, INTENT(IN) :: axisDomOrder(:) 
     34    ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask, name ) 
     35     
     36    IMPLICIT NONE 
     37      TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
     38      LOGICAL  , OPTIONAL, INTENT(IN) :: axisDomainOrder(:) 
     39      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder_tmp(:) 
    3840      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description 
    3941      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref 
    … …  
    4345       
    4446      CALL xios(set_gridgroup_attr_hdl_)  & 
    45       ( gridgroup_hdl, axisDomOrder, description, group_ref, mask, name ) 
     47      ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask, name ) 
    4648     
    4749  END SUBROUTINE xios(set_gridgroup_attr_hdl) 
    4850   
    4951  SUBROUTINE xios(set_gridgroup_attr_hdl_)   & 
    50     ( gridgroup_hdl, axisDomOrder_, description_, group_ref_, mask_, name_ ) 
    51      
    52     IMPLICIT NONE 
    53       TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    54       INTEGER  , OPTIONAL, INTENT(IN) :: axisDomOrder_(:) 
     52    ( gridgroup_hdl, axisDomainOrder_, description_, group_ref_, mask_, name_ ) 
     53     
     54    IMPLICIT NONE 
     55      TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
     56      LOGICAL  , OPTIONAL, INTENT(IN) :: axisDomainOrder_(:) 
     57      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder__tmp(:) 
    5558      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description_ 
    5659      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref_ 
    … …  
    5962      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name_ 
    6063       
    61       IF (PRESENT(axisDomOrder_)) THEN 
    62         CALL cxios_set_gridgroup_axisDomOrder(gridgroup_hdl%daddr, axisDomOrder_,size(axisDomOrder_,1)) 
     64      IF (PRESENT(axisDomainOrder_)) THEN 
     65        ALLOCATE(axisDomainOrder__tmp(size(axisDomainOrder_,1))) 
     66        axisDomainOrder__tmp=axisDomainOrder_ 
     67        CALL cxios_set_gridgroup_axisDomainOrder(gridgroup_hdl%daddr, axisDomainOrder__tmp,size(axisDomainOrder_,1)) 
    6368      ENDIF 
    6469       
    … …  
    8691   
    8792  SUBROUTINE xios(get_gridgroup_attr)  & 
    88     ( gridgroup_id, axisDomOrder, description, group_ref, mask, name ) 
     93    ( gridgroup_id, axisDomainOrder, description, group_ref, mask, name ) 
    8994     
    9095    IMPLICIT NONE 
    9196      TYPE(txios(gridgroup))  :: gridgroup_hdl 
    9297      CHARACTER(LEN=*), INTENT(IN) ::gridgroup_id 
    93       INTEGER  , OPTIONAL, INTENT(OUT) :: axisDomOrder(:) 
     98      LOGICAL  , OPTIONAL, INTENT(OUT) :: axisDomainOrder(:) 
     99      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder_tmp(:) 
    94100      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description 
    95101      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref 
    … …  
    100106      CALL xios(get_gridgroup_handle)(gridgroup_id,gridgroup_hdl) 
    101107      CALL xios(get_gridgroup_attr_hdl_)   & 
    102       ( gridgroup_hdl, axisDomOrder, description, group_ref, mask, name ) 
     108      ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask, name ) 
    103109     
    104110  END SUBROUTINE xios(get_gridgroup_attr) 
    105111   
    106112  SUBROUTINE xios(get_gridgroup_attr_hdl)  & 
    107     ( gridgroup_hdl, axisDomOrder, description, group_ref, mask, name ) 
    108      
    109     IMPLICIT NONE 
    110       TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    111       INTEGER  , OPTIONAL, INTENT(OUT) :: axisDomOrder(:) 
     113    ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask, name ) 
     114     
     115    IMPLICIT NONE 
     116      TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
     117      LOGICAL  , OPTIONAL, INTENT(OUT) :: axisDomainOrder(:) 
     118      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder_tmp(:) 
    112119      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description 
    113120      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref 
    … …  
    117124       
    118125      CALL xios(get_gridgroup_attr_hdl_)  & 
    119       ( gridgroup_hdl, axisDomOrder, description, group_ref, mask, name ) 
     126      ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask, name ) 
    120127     
    121128  END SUBROUTINE xios(get_gridgroup_attr_hdl) 
    122129   
    123130  SUBROUTINE xios(get_gridgroup_attr_hdl_)   & 
    124     ( gridgroup_hdl, axisDomOrder_, description_, group_ref_, mask_, name_ ) 
    125      
    126     IMPLICIT NONE 
    127       TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    128       INTEGER  , OPTIONAL, INTENT(OUT) :: axisDomOrder_(:) 
     131    ( gridgroup_hdl, axisDomainOrder_, description_, group_ref_, mask_, name_ ) 
     132     
     133    IMPLICIT NONE 
     134      TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
     135      LOGICAL  , OPTIONAL, INTENT(OUT) :: axisDomainOrder_(:) 
     136      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder__tmp(:) 
    129137      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description_ 
    130138      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref_ 
    … …  
    133141      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name_ 
    134142       
    135       IF (PRESENT(axisDomOrder_)) THEN 
    136         CALL cxios_get_gridgroup_axisDomOrder(gridgroup_hdl%daddr, axisDomOrder_,size(axisDomOrder_,1)) 
     143      IF (PRESENT(axisDomainOrder_)) THEN 
     144        ALLOCATE(axisDomainOrder__tmp(size(axisDomainOrder_,1))) 
     145        CALL cxios_get_gridgroup_axisDomainOrder(gridgroup_hdl%daddr, axisDomainOrder__tmp,size(axisDomainOrder_,1)) 
     146        axisDomainOrder_=axisDomainOrder__tmp_ 
    137147      ENDIF 
    138148       
    … …  
    160170   
    161171  SUBROUTINE xios(is_defined_gridgroup_attr)  & 
    162     ( gridgroup_id, axisDomOrder, description, group_ref, mask, name ) 
     172    ( gridgroup_id, axisDomainOrder, description, group_ref, mask, name ) 
    163173     
    164174    IMPLICIT NONE 
    165175      TYPE(txios(gridgroup))  :: gridgroup_hdl 
    166176      CHARACTER(LEN=*), INTENT(IN) ::gridgroup_id 
    167       LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomOrder 
    168       LOGICAL(KIND=C_BOOL) :: axisDomOrder_tmp 
     177      LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomainOrder 
     178      LOGICAL(KIND=C_BOOL) :: axisDomainOrder_tmp 
    169179      LOGICAL, OPTIONAL, INTENT(OUT) :: description 
    170180      LOGICAL(KIND=C_BOOL) :: description_tmp 
    … …  
    178188      CALL xios(get_gridgroup_handle)(gridgroup_id,gridgroup_hdl) 
    179189      CALL xios(is_defined_gridgroup_attr_hdl_)   & 
    180       ( gridgroup_hdl, axisDomOrder, description, group_ref, mask, name ) 
     190      ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask, name ) 
    181191     
    182192  END SUBROUTINE xios(is_defined_gridgroup_attr) 
    183193   
    184194  SUBROUTINE xios(is_defined_gridgroup_attr_hdl)  & 
    185     ( gridgroup_hdl, axisDomOrder, description, group_ref, mask, name ) 
    186      
    187     IMPLICIT NONE 
    188       TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    189       LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomOrder 
    190       LOGICAL(KIND=C_BOOL) :: axisDomOrder_tmp 
     195    ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask, name ) 
     196     
     197    IMPLICIT NONE 
     198      TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
     199      LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomainOrder 
     200      LOGICAL(KIND=C_BOOL) :: axisDomainOrder_tmp 
    191201      LOGICAL, OPTIONAL, INTENT(OUT) :: description 
    192202      LOGICAL(KIND=C_BOOL) :: description_tmp 
    … …  
    199209       
    200210      CALL xios(is_defined_gridgroup_attr_hdl_)  & 
    201       ( gridgroup_hdl, axisDomOrder, description, group_ref, mask, name ) 
     211      ( gridgroup_hdl, axisDomainOrder, description, group_ref, mask, name ) 
    202212     
    203213  END SUBROUTINE xios(is_defined_gridgroup_attr_hdl) 
    204214   
    205215  SUBROUTINE xios(is_defined_gridgroup_attr_hdl_)   & 
    206     ( gridgroup_hdl, axisDomOrder_, description_, group_ref_, mask_, name_ ) 
    207      
    208     IMPLICIT NONE 
    209       TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    210       LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomOrder_ 
    211       LOGICAL(KIND=C_BOOL) :: axisDomOrder__tmp 
     216    ( gridgroup_hdl, axisDomainOrder_, description_, group_ref_, mask_, name_ ) 
     217     
     218    IMPLICIT NONE 
     219      TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
     220      LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomainOrder_ 
     221      LOGICAL(KIND=C_BOOL) :: axisDomainOrder__tmp 
    212222      LOGICAL, OPTIONAL, INTENT(OUT) :: description_ 
    213223      LOGICAL(KIND=C_BOOL) :: description__tmp 
    … …  
    219229      LOGICAL(KIND=C_BOOL) :: name__tmp 
    220230       
    221       IF (PRESENT(axisDomOrder_)) THEN 
    222         axisDomOrder__tmp=cxios_is_defined_gridgroup_axisDomOrder(gridgroup_hdl%daddr) 
    223         axisDomOrder_=axisDomOrder__tmp 
     231      IF (PRESENT(axisDomainOrder_)) THEN 
     232        axisDomainOrder__tmp=cxios_is_defined_gridgroup_axisDomainOrder(gridgroup_hdl%daddr) 
     233        axisDomainOrder_=axisDomainOrder__tmp 
    224234      ENDIF 
    225235       
Note: See TracChangeset for help on using the changeset viewer.