Ignore:
Timestamp:
12/17/14 15:35:12 (10 years ago)
Author:
rlacroix
Message:

Update the Fortran interface after r540.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r501 r546  
    1212   
    1313  SUBROUTINE xios(set_grid_attr)  & 
    14     ( grid_id, axis_ref, description, domain_ref, mask, name ) 
     14    ( grid_id, axisDomOrder, description, mask, name ) 
    1515     
    1616    IMPLICIT NONE 
    1717      TYPE(txios(grid))  :: grid_hdl 
    1818      CHARACTER(LEN=*), INTENT(IN) ::grid_id 
    19       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref 
     19      INTEGER  , OPTIONAL, INTENT(IN) :: axisDomOrder(:) 
    2020      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description 
    21       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_ref 
    2221      LOGICAL  , OPTIONAL, INTENT(IN) :: mask(:,:,:) 
    2322      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:,:,:) 
    … …  
    2625      CALL xios(get_grid_handle)(grid_id,grid_hdl) 
    2726      CALL xios(set_grid_attr_hdl_)   & 
    28       ( grid_hdl, axis_ref, description, domain_ref, mask, name ) 
     27      ( grid_hdl, axisDomOrder, description, mask, name ) 
    2928     
    3029  END SUBROUTINE xios(set_grid_attr) 
    3130   
    3231  SUBROUTINE xios(set_grid_attr_hdl)  & 
    33     ( grid_hdl, axis_ref, description, domain_ref, mask, name ) 
    34      
    35     IMPLICIT NONE 
    36       TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    37       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref 
     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(:) 
    3837      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description 
    39       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_ref 
    4038      LOGICAL  , OPTIONAL, INTENT(IN) :: mask(:,:,:) 
    4139      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:,:,:) 
    … …  
    4341       
    4442      CALL xios(set_grid_attr_hdl_)  & 
    45       ( grid_hdl, axis_ref, description, domain_ref, mask, name ) 
     43      ( grid_hdl, axisDomOrder, description, mask, name ) 
    4644     
    4745  END SUBROUTINE xios(set_grid_attr_hdl) 
    4846   
    4947  SUBROUTINE xios(set_grid_attr_hdl_)   & 
    50     ( grid_hdl, axis_ref_, description_, domain_ref_, mask_, name_ ) 
    51      
    52     IMPLICIT NONE 
    53       TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    54       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref_ 
     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_(:) 
    5553      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description_ 
    56       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_ref_ 
    5754      LOGICAL  , OPTIONAL, INTENT(IN) :: mask_(:,:,:) 
    5855      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask__tmp(:,:,:) 
    5956      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name_ 
    6057       
    61       IF (PRESENT(axis_ref_)) THEN 
    62         CALL cxios_set_grid_axis_ref(grid_hdl%daddr, axis_ref_, len(axis_ref_)) 
     58      IF (PRESENT(axisDomOrder_)) THEN 
     59        CALL cxios_set_grid_axisDomOrder(grid_hdl%daddr, axisDomOrder_,size(axisDomOrder_,1)) 
    6360      ENDIF 
    6461       
    6562      IF (PRESENT(description_)) THEN 
    6663        CALL cxios_set_grid_description(grid_hdl%daddr, description_, len(description_)) 
    67       ENDIF 
    68        
    69       IF (PRESENT(domain_ref_)) THEN 
    70         CALL cxios_set_grid_domain_ref(grid_hdl%daddr, domain_ref_, len(domain_ref_)) 
    7164      ENDIF 
    7265       
    … …  
    8679   
    8780  SUBROUTINE xios(get_grid_attr)  & 
    88     ( grid_id, axis_ref, description, domain_ref, mask, name ) 
     81    ( grid_id, axisDomOrder, description, mask, name ) 
    8982     
    9083    IMPLICIT NONE 
    9184      TYPE(txios(grid))  :: grid_hdl 
    9285      CHARACTER(LEN=*), INTENT(IN) ::grid_id 
    93       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref 
     86      INTEGER  , OPTIONAL, INTENT(OUT) :: axisDomOrder(:) 
    9487      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description 
    95       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_ref 
    9688      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask(:,:,:) 
    9789      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:,:,:) 
    … …  
    10092      CALL xios(get_grid_handle)(grid_id,grid_hdl) 
    10193      CALL xios(get_grid_attr_hdl_)   & 
    102       ( grid_hdl, axis_ref, description, domain_ref, mask, name ) 
     94      ( grid_hdl, axisDomOrder, description, mask, name ) 
    10395     
    10496  END SUBROUTINE xios(get_grid_attr) 
    10597   
    10698  SUBROUTINE xios(get_grid_attr_hdl)  & 
    107     ( grid_hdl, axis_ref, description, domain_ref, mask, name ) 
    108      
    109     IMPLICIT NONE 
    110       TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    111       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref 
     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(:) 
    112104      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description 
    113       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_ref 
    114105      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask(:,:,:) 
    115106      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:,:,:) 
    … …  
    117108       
    118109      CALL xios(get_grid_attr_hdl_)  & 
    119       ( grid_hdl, axis_ref, description, domain_ref, mask, name ) 
     110      ( grid_hdl, axisDomOrder, description, mask, name ) 
    120111     
    121112  END SUBROUTINE xios(get_grid_attr_hdl) 
    122113   
    123114  SUBROUTINE xios(get_grid_attr_hdl_)   & 
    124     ( grid_hdl, axis_ref_, description_, domain_ref_, mask_, name_ ) 
    125      
    126     IMPLICIT NONE 
    127       TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    128       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref_ 
     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_(:) 
    129120      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description_ 
    130       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_ref_ 
    131121      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask_(:,:,:) 
    132122      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask__tmp(:,:,:) 
    133123      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name_ 
    134124       
    135       IF (PRESENT(axis_ref_)) THEN 
    136         CALL cxios_get_grid_axis_ref(grid_hdl%daddr, axis_ref_, len(axis_ref_)) 
     125      IF (PRESENT(axisDomOrder_)) THEN 
     126        CALL cxios_get_grid_axisDomOrder(grid_hdl%daddr, axisDomOrder_,size(axisDomOrder_,1)) 
    137127      ENDIF 
    138128       
    139129      IF (PRESENT(description_)) THEN 
    140130        CALL cxios_get_grid_description(grid_hdl%daddr, description_, len(description_)) 
    141       ENDIF 
    142        
    143       IF (PRESENT(domain_ref_)) THEN 
    144         CALL cxios_get_grid_domain_ref(grid_hdl%daddr, domain_ref_, len(domain_ref_)) 
    145131      ENDIF 
    146132       
    … …  
    160146   
    161147  SUBROUTINE xios(is_defined_grid_attr)  & 
    162     ( grid_id, axis_ref, description, domain_ref, mask, name ) 
     148    ( grid_id, axisDomOrder, description, mask, name ) 
    163149     
    164150    IMPLICIT NONE 
    165151      TYPE(txios(grid))  :: grid_hdl 
    166152      CHARACTER(LEN=*), INTENT(IN) ::grid_id 
    167       LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref 
    168       LOGICAL(KIND=C_BOOL) :: axis_ref_tmp 
     153      LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomOrder 
     154      LOGICAL(KIND=C_BOOL) :: axisDomOrder_tmp 
    169155      LOGICAL, OPTIONAL, INTENT(OUT) :: description 
    170156      LOGICAL(KIND=C_BOOL) :: description_tmp 
    171       LOGICAL, OPTIONAL, INTENT(OUT) :: domain_ref 
    172       LOGICAL(KIND=C_BOOL) :: domain_ref_tmp 
    173157      LOGICAL, OPTIONAL, INTENT(OUT) :: mask 
    174158      LOGICAL(KIND=C_BOOL) :: mask_tmp 
    … …  
    178162      CALL xios(get_grid_handle)(grid_id,grid_hdl) 
    179163      CALL xios(is_defined_grid_attr_hdl_)   & 
    180       ( grid_hdl, axis_ref, description, domain_ref, mask, name ) 
     164      ( grid_hdl, axisDomOrder, description, mask, name ) 
    181165     
    182166  END SUBROUTINE xios(is_defined_grid_attr) 
    183167   
    184168  SUBROUTINE xios(is_defined_grid_attr_hdl)  & 
    185     ( grid_hdl, axis_ref, description, domain_ref, mask, name ) 
    186      
    187     IMPLICIT NONE 
    188       TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    189       LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref 
    190       LOGICAL(KIND=C_BOOL) :: axis_ref_tmp 
     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 
    191175      LOGICAL, OPTIONAL, INTENT(OUT) :: description 
    192176      LOGICAL(KIND=C_BOOL) :: description_tmp 
    193       LOGICAL, OPTIONAL, INTENT(OUT) :: domain_ref 
    194       LOGICAL(KIND=C_BOOL) :: domain_ref_tmp 
    195177      LOGICAL, OPTIONAL, INTENT(OUT) :: mask 
    196178      LOGICAL(KIND=C_BOOL) :: mask_tmp 
    … …  
    199181       
    200182      CALL xios(is_defined_grid_attr_hdl_)  & 
    201       ( grid_hdl, axis_ref, description, domain_ref, mask, name ) 
     183      ( grid_hdl, axisDomOrder, description, mask, name ) 
    202184     
    203185  END SUBROUTINE xios(is_defined_grid_attr_hdl) 
    204186   
    205187  SUBROUTINE xios(is_defined_grid_attr_hdl_)   & 
    206     ( grid_hdl, axis_ref_, description_, domain_ref_, mask_, name_ ) 
    207      
    208     IMPLICIT NONE 
    209       TYPE(txios(grid)) , INTENT(IN) :: grid_hdl 
    210       LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref_ 
    211       LOGICAL(KIND=C_BOOL) :: axis_ref__tmp 
     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 
    212194      LOGICAL, OPTIONAL, INTENT(OUT) :: description_ 
    213195      LOGICAL(KIND=C_BOOL) :: description__tmp 
    214       LOGICAL, OPTIONAL, INTENT(OUT) :: domain_ref_ 
    215       LOGICAL(KIND=C_BOOL) :: domain_ref__tmp 
    216196      LOGICAL, OPTIONAL, INTENT(OUT) :: mask_ 
    217197      LOGICAL(KIND=C_BOOL) :: mask__tmp 
    … …  
    219199      LOGICAL(KIND=C_BOOL) :: name__tmp 
    220200       
    221       IF (PRESENT(axis_ref_)) THEN 
    222         axis_ref__tmp=cxios_is_defined_grid_axis_ref(grid_hdl%daddr) 
    223         axis_ref_=axis_ref__tmp 
     201      IF (PRESENT(axisDomOrder_)) THEN 
     202        axisDomOrder__tmp=cxios_is_defined_grid_axisDomOrder(grid_hdl%daddr) 
     203        axisDomOrder_=axisDomOrder__tmp 
    224204      ENDIF 
    225205       
    … …  
    229209      ENDIF 
    230210       
    231       IF (PRESENT(domain_ref_)) THEN 
    232         domain_ref__tmp=cxios_is_defined_grid_domain_ref(grid_hdl%daddr) 
    233         domain_ref_=domain_ref__tmp 
    234       ENDIF 
    235        
    236211      IF (PRESENT(mask_)) THEN 
    237212        mask__tmp=cxios_is_defined_grid_mask(grid_hdl%daddr) 
Note: See TracChangeset for help on using the changeset viewer.