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

    r546 r555  
    1212   
    1313  SUBROUTINE xios(set_grid_attr)  & 
    14     ( grid_id, axisDomOrder, description, mask, name ) 
     14    ( grid_id, axisDomainOrder, description, mask, name ) 
    1515     
    1616    IMPLICIT NONE 
    1717      TYPE(txios(grid))  :: grid_hdl 
    1818      CHARACTER(LEN=*), INTENT(IN) ::grid_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      LOGICAL  , OPTIONAL, INTENT(IN) :: mask(:,:,:) 
    … …  
    2526      CALL xios(get_grid_handle)(grid_id,grid_hdl) 
    2627      CALL xios(set_grid_attr_hdl_)   & 
    27       ( grid_hdl, axisDomOrder, description, mask, name ) 
     28      ( grid_hdl, axisDomainOrder, description, mask, name ) 
    2829     
    2930  END SUBROUTINE xios(set_grid_attr) 
    3031   
    3132  SUBROUTINE xios(set_grid_attr_hdl)  & 
    32     ( grid_hdl, axisDomOrder, description, mask, name ) 
    33      
    34     IMPLICIT NONE 
    35       TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    36       INTEGER  , OPTIONAL, INTENT(IN) :: axisDomOrder(:) 
     33    ( grid_hdl, axisDomainOrder, description, mask, name ) 
     34     
     35    IMPLICIT NONE 
     36      TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
     37      LOGICAL  , OPTIONAL, INTENT(IN) :: axisDomainOrder(:) 
     38      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder_tmp(:) 
    3739      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description 
    3840      LOGICAL  , OPTIONAL, INTENT(IN) :: mask(:,:,:) 
    … …  
    4143       
    4244      CALL xios(set_grid_attr_hdl_)  & 
    43       ( grid_hdl, axisDomOrder, description, mask, name ) 
     45      ( grid_hdl, axisDomainOrder, description, mask, name ) 
    4446     
    4547  END SUBROUTINE xios(set_grid_attr_hdl) 
    4648   
    4749  SUBROUTINE xios(set_grid_attr_hdl_)   & 
    48     ( grid_hdl, axisDomOrder_, description_, mask_, name_ ) 
    49      
    50     IMPLICIT NONE 
    51       TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    52       INTEGER  , OPTIONAL, INTENT(IN) :: axisDomOrder_(:) 
     50    ( grid_hdl, axisDomainOrder_, description_, mask_, name_ ) 
     51     
     52    IMPLICIT NONE 
     53      TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
     54      LOGICAL  , OPTIONAL, INTENT(IN) :: axisDomainOrder_(:) 
     55      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder__tmp(:) 
    5356      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description_ 
    5457      LOGICAL  , OPTIONAL, INTENT(IN) :: mask_(:,:,:) 
    … …  
    5659      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name_ 
    5760       
    58       IF (PRESENT(axisDomOrder_)) THEN 
    59         CALL cxios_set_grid_axisDomOrder(grid_hdl%daddr, axisDomOrder_,size(axisDomOrder_,1)) 
     61      IF (PRESENT(axisDomainOrder_)) THEN 
     62        ALLOCATE(axisDomainOrder__tmp(size(axisDomainOrder_,1))) 
     63        axisDomainOrder__tmp=axisDomainOrder_ 
     64        CALL cxios_set_grid_axisDomainOrder(grid_hdl%daddr, axisDomainOrder__tmp,size(axisDomainOrder_,1)) 
    6065      ENDIF 
    6166       
    … …  
    7984   
    8085  SUBROUTINE xios(get_grid_attr)  & 
    81     ( grid_id, axisDomOrder, description, mask, name ) 
     86    ( grid_id, axisDomainOrder, description, mask, name ) 
    8287     
    8388    IMPLICIT NONE 
    8489      TYPE(txios(grid))  :: grid_hdl 
    8590      CHARACTER(LEN=*), INTENT(IN) ::grid_id 
    86       INTEGER  , OPTIONAL, INTENT(OUT) :: axisDomOrder(:) 
     91      LOGICAL  , OPTIONAL, INTENT(OUT) :: axisDomainOrder(:) 
     92      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder_tmp(:) 
    8793      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description 
    8894      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask(:,:,:) 
    … …  
    9298      CALL xios(get_grid_handle)(grid_id,grid_hdl) 
    9399      CALL xios(get_grid_attr_hdl_)   & 
    94       ( grid_hdl, axisDomOrder, description, mask, name ) 
     100      ( grid_hdl, axisDomainOrder, description, mask, name ) 
    95101     
    96102  END SUBROUTINE xios(get_grid_attr) 
    97103   
    98104  SUBROUTINE xios(get_grid_attr_hdl)  & 
    99     ( grid_hdl, axisDomOrder, description, mask, name ) 
    100      
    101     IMPLICIT NONE 
    102       TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    103       INTEGER  , OPTIONAL, INTENT(OUT) :: axisDomOrder(:) 
     105    ( grid_hdl, axisDomainOrder, description, mask, name ) 
     106     
     107    IMPLICIT NONE 
     108      TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
     109      LOGICAL  , OPTIONAL, INTENT(OUT) :: axisDomainOrder(:) 
     110      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder_tmp(:) 
    104111      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description 
    105112      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask(:,:,:) 
    … …  
    108115       
    109116      CALL xios(get_grid_attr_hdl_)  & 
    110       ( grid_hdl, axisDomOrder, description, mask, name ) 
     117      ( grid_hdl, axisDomainOrder, description, mask, name ) 
    111118     
    112119  END SUBROUTINE xios(get_grid_attr_hdl) 
    113120   
    114121  SUBROUTINE xios(get_grid_attr_hdl_)   & 
    115     ( grid_hdl, axisDomOrder_, description_, mask_, name_ ) 
    116      
    117     IMPLICIT NONE 
    118       TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    119       INTEGER  , OPTIONAL, INTENT(OUT) :: axisDomOrder_(:) 
     122    ( grid_hdl, axisDomainOrder_, description_, mask_, name_ ) 
     123     
     124    IMPLICIT NONE 
     125      TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
     126      LOGICAL  , OPTIONAL, INTENT(OUT) :: axisDomainOrder_(:) 
     127      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: axisDomainOrder__tmp(:) 
    120128      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description_ 
    121129      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask_(:,:,:) 
    … …  
    123131      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name_ 
    124132       
    125       IF (PRESENT(axisDomOrder_)) THEN 
    126         CALL cxios_get_grid_axisDomOrder(grid_hdl%daddr, axisDomOrder_,size(axisDomOrder_,1)) 
     133      IF (PRESENT(axisDomainOrder_)) THEN 
     134        ALLOCATE(axisDomainOrder__tmp(size(axisDomainOrder_,1))) 
     135        CALL cxios_get_grid_axisDomainOrder(grid_hdl%daddr, axisDomainOrder__tmp,size(axisDomainOrder_,1)) 
     136        axisDomainOrder_=axisDomainOrder__tmp_ 
    127137      ENDIF 
    128138       
    … …  
    146156   
    147157  SUBROUTINE xios(is_defined_grid_attr)  & 
    148     ( grid_id, axisDomOrder, description, mask, name ) 
     158    ( grid_id, axisDomainOrder, description, mask, name ) 
    149159     
    150160    IMPLICIT NONE 
    151161      TYPE(txios(grid))  :: grid_hdl 
    152162      CHARACTER(LEN=*), INTENT(IN) ::grid_id 
    153       LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomOrder 
    154       LOGICAL(KIND=C_BOOL) :: axisDomOrder_tmp 
     163      LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomainOrder 
     164      LOGICAL(KIND=C_BOOL) :: axisDomainOrder_tmp 
    155165      LOGICAL, OPTIONAL, INTENT(OUT) :: description 
    156166      LOGICAL(KIND=C_BOOL) :: description_tmp 
    … …  
    162172      CALL xios(get_grid_handle)(grid_id,grid_hdl) 
    163173      CALL xios(is_defined_grid_attr_hdl_)   & 
    164       ( grid_hdl, axisDomOrder, description, mask, name ) 
     174      ( grid_hdl, axisDomainOrder, description, mask, name ) 
    165175     
    166176  END SUBROUTINE xios(is_defined_grid_attr) 
    167177   
    168178  SUBROUTINE xios(is_defined_grid_attr_hdl)  & 
    169     ( grid_hdl, axisDomOrder, description, mask, name ) 
    170      
    171     IMPLICIT NONE 
    172       TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    173       LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomOrder 
    174       LOGICAL(KIND=C_BOOL) :: axisDomOrder_tmp 
     179    ( grid_hdl, axisDomainOrder, description, mask, name ) 
     180     
     181    IMPLICIT NONE 
     182      TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
     183      LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomainOrder 
     184      LOGICAL(KIND=C_BOOL) :: axisDomainOrder_tmp 
    175185      LOGICAL, OPTIONAL, INTENT(OUT) :: description 
    176186      LOGICAL(KIND=C_BOOL) :: description_tmp 
    … …  
    181191       
    182192      CALL xios(is_defined_grid_attr_hdl_)  & 
    183       ( grid_hdl, axisDomOrder, description, mask, name ) 
     193      ( grid_hdl, axisDomainOrder, description, mask, name ) 
    184194     
    185195  END SUBROUTINE xios(is_defined_grid_attr_hdl) 
    186196   
    187197  SUBROUTINE xios(is_defined_grid_attr_hdl_)   & 
    188     ( grid_hdl, axisDomOrder_, description_, mask_, name_ ) 
    189      
    190     IMPLICIT NONE 
    191       TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    192       LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomOrder_ 
    193       LOGICAL(KIND=C_BOOL) :: axisDomOrder__tmp 
     198    ( grid_hdl, axisDomainOrder_, description_, mask_, name_ ) 
     199     
     200    IMPLICIT NONE 
     201      TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
     202      LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomainOrder_ 
     203      LOGICAL(KIND=C_BOOL) :: axisDomainOrder__tmp 
    194204      LOGICAL, OPTIONAL, INTENT(OUT) :: description_ 
    195205      LOGICAL(KIND=C_BOOL) :: description__tmp 
    … …  
    199209      LOGICAL(KIND=C_BOOL) :: name__tmp 
    200210       
    201       IF (PRESENT(axisDomOrder_)) THEN 
    202         axisDomOrder__tmp=cxios_is_defined_grid_axisDomOrder(grid_hdl%daddr) 
    203         axisDomOrder_=axisDomOrder__tmp 
     211      IF (PRESENT(axisDomainOrder_)) THEN 
     212        axisDomainOrder__tmp=cxios_is_defined_grid_axisDomainOrder(grid_hdl%daddr) 
     213        axisDomainOrder_=axisDomainOrder__tmp 
    204214      ENDIF 
    205215       
Note: See TracChangeset for help on using the changeset viewer.