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

    r501 r546  
    1212   
    1313  SUBROUTINE xios(set_gridgroup_attr)  & 
    14     ( gridgroup_id, axis_ref, description, domain_ref, group_ref, mask, name ) 
     14    ( gridgroup_id, axisDomOrder, description, group_ref, mask, name ) 
    1515     
    1616    IMPLICIT NONE 
    1717      TYPE(txios(gridgroup))  :: gridgroup_hdl 
    1818      CHARACTER(LEN=*), INTENT(IN) ::gridgroup_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      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref 
    2322      LOGICAL  , OPTIONAL, INTENT(IN) :: mask(:,:,:) 
    … …  
    2726      CALL xios(get_gridgroup_handle)(gridgroup_id,gridgroup_hdl) 
    2827      CALL xios(set_gridgroup_attr_hdl_)   & 
    29       ( gridgroup_hdl, axis_ref, description, domain_ref, group_ref, mask, name ) 
     28      ( gridgroup_hdl, axisDomOrder, description, group_ref, mask, name ) 
    3029     
    3130  END SUBROUTINE xios(set_gridgroup_attr) 
    3231   
    3332  SUBROUTINE xios(set_gridgroup_attr_hdl)  & 
    34     ( gridgroup_hdl, axis_ref, description, domain_ref, group_ref, mask, name ) 
    35      
    36     IMPLICIT NONE 
    37       TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    38       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref 
     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(:) 
    3938      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description 
    40       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_ref 
    4139      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref 
    4240      LOGICAL  , OPTIONAL, INTENT(IN) :: mask(:,:,:) 
    … …  
    4543       
    4644      CALL xios(set_gridgroup_attr_hdl_)  & 
    47       ( gridgroup_hdl, axis_ref, description, domain_ref, group_ref, mask, name ) 
     45      ( gridgroup_hdl, axisDomOrder, description, group_ref, mask, name ) 
    4846     
    4947  END SUBROUTINE xios(set_gridgroup_attr_hdl) 
    5048   
    5149  SUBROUTINE xios(set_gridgroup_attr_hdl_)   & 
    52     ( gridgroup_hdl, axis_ref_, description_, domain_ref_, group_ref_, mask_, name_ ) 
    53      
    54     IMPLICIT NONE 
    55       TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    56       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: axis_ref_ 
     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_(:) 
    5755      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description_ 
    58       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_ref_ 
    5956      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref_ 
    6057      LOGICAL  , OPTIONAL, INTENT(IN) :: mask_(:,:,:) 
    … …  
    6259      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name_ 
    6360       
    64       IF (PRESENT(axis_ref_)) THEN 
    65         CALL cxios_set_gridgroup_axis_ref(gridgroup_hdl%daddr, axis_ref_, len(axis_ref_)) 
     61      IF (PRESENT(axisDomOrder_)) THEN 
     62        CALL cxios_set_gridgroup_axisDomOrder(gridgroup_hdl%daddr, axisDomOrder_,size(axisDomOrder_,1)) 
    6663      ENDIF 
    6764       
    6865      IF (PRESENT(description_)) THEN 
    6966        CALL cxios_set_gridgroup_description(gridgroup_hdl%daddr, description_, len(description_)) 
    70       ENDIF 
    71        
    72       IF (PRESENT(domain_ref_)) THEN 
    73         CALL cxios_set_gridgroup_domain_ref(gridgroup_hdl%daddr, domain_ref_, len(domain_ref_)) 
    7467      ENDIF 
    7568       
    … …  
    9386   
    9487  SUBROUTINE xios(get_gridgroup_attr)  & 
    95     ( gridgroup_id, axis_ref, description, domain_ref, group_ref, mask, name ) 
     88    ( gridgroup_id, axisDomOrder, description, group_ref, mask, name ) 
    9689     
    9790    IMPLICIT NONE 
    9891      TYPE(txios(gridgroup))  :: gridgroup_hdl 
    9992      CHARACTER(LEN=*), INTENT(IN) ::gridgroup_id 
    100       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref 
     93      INTEGER  , OPTIONAL, INTENT(OUT) :: axisDomOrder(:) 
    10194      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description 
    102       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_ref 
    10395      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref 
    10496      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask(:,:,:) 
    … …  
    108100      CALL xios(get_gridgroup_handle)(gridgroup_id,gridgroup_hdl) 
    109101      CALL xios(get_gridgroup_attr_hdl_)   & 
    110       ( gridgroup_hdl, axis_ref, description, domain_ref, group_ref, mask, name ) 
     102      ( gridgroup_hdl, axisDomOrder, description, group_ref, mask, name ) 
    111103     
    112104  END SUBROUTINE xios(get_gridgroup_attr) 
    113105   
    114106  SUBROUTINE xios(get_gridgroup_attr_hdl)  & 
    115     ( gridgroup_hdl, axis_ref, description, domain_ref, group_ref, mask, name ) 
    116      
    117     IMPLICIT NONE 
    118       TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    119       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref 
     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(:) 
    120112      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description 
    121       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_ref 
    122113      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref 
    123114      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask(:,:,:) 
    … …  
    126117       
    127118      CALL xios(get_gridgroup_attr_hdl_)  & 
    128       ( gridgroup_hdl, axis_ref, description, domain_ref, group_ref, mask, name ) 
     119      ( gridgroup_hdl, axisDomOrder, description, group_ref, mask, name ) 
    129120     
    130121  END SUBROUTINE xios(get_gridgroup_attr_hdl) 
    131122   
    132123  SUBROUTINE xios(get_gridgroup_attr_hdl_)   & 
    133     ( gridgroup_hdl, axis_ref_, description_, domain_ref_, group_ref_, mask_, name_ ) 
    134      
    135     IMPLICIT NONE 
    136       TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    137       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: axis_ref_ 
     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_(:) 
    138129      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description_ 
    139       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_ref_ 
    140130      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref_ 
    141131      LOGICAL  , OPTIONAL, INTENT(OUT) :: mask_(:,:,:) 
    … …  
    143133      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name_ 
    144134       
    145       IF (PRESENT(axis_ref_)) THEN 
    146         CALL cxios_get_gridgroup_axis_ref(gridgroup_hdl%daddr, axis_ref_, len(axis_ref_)) 
     135      IF (PRESENT(axisDomOrder_)) THEN 
     136        CALL cxios_get_gridgroup_axisDomOrder(gridgroup_hdl%daddr, axisDomOrder_,size(axisDomOrder_,1)) 
    147137      ENDIF 
    148138       
    149139      IF (PRESENT(description_)) THEN 
    150140        CALL cxios_get_gridgroup_description(gridgroup_hdl%daddr, description_, len(description_)) 
    151       ENDIF 
    152        
    153       IF (PRESENT(domain_ref_)) THEN 
    154         CALL cxios_get_gridgroup_domain_ref(gridgroup_hdl%daddr, domain_ref_, len(domain_ref_)) 
    155141      ENDIF 
    156142       
    … …  
    174160   
    175161  SUBROUTINE xios(is_defined_gridgroup_attr)  & 
    176     ( gridgroup_id, axis_ref, description, domain_ref, group_ref, mask, name ) 
     162    ( gridgroup_id, axisDomOrder, description, group_ref, mask, name ) 
    177163     
    178164    IMPLICIT NONE 
    179165      TYPE(txios(gridgroup))  :: gridgroup_hdl 
    180166      CHARACTER(LEN=*), INTENT(IN) ::gridgroup_id 
    181       LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref 
    182       LOGICAL(KIND=C_BOOL) :: axis_ref_tmp 
     167      LOGICAL, OPTIONAL, INTENT(OUT) :: axisDomOrder 
     168      LOGICAL(KIND=C_BOOL) :: axisDomOrder_tmp 
    183169      LOGICAL, OPTIONAL, INTENT(OUT) :: description 
    184170      LOGICAL(KIND=C_BOOL) :: description_tmp 
    185       LOGICAL, OPTIONAL, INTENT(OUT) :: domain_ref 
    186       LOGICAL(KIND=C_BOOL) :: domain_ref_tmp 
    187171      LOGICAL, OPTIONAL, INTENT(OUT) :: group_ref 
    188172      LOGICAL(KIND=C_BOOL) :: group_ref_tmp 
    … …  
    194178      CALL xios(get_gridgroup_handle)(gridgroup_id,gridgroup_hdl) 
    195179      CALL xios(is_defined_gridgroup_attr_hdl_)   & 
    196       ( gridgroup_hdl, axis_ref, description, domain_ref, group_ref, mask, name ) 
     180      ( gridgroup_hdl, axisDomOrder, description, group_ref, mask, name ) 
    197181     
    198182  END SUBROUTINE xios(is_defined_gridgroup_attr) 
    199183   
    200184  SUBROUTINE xios(is_defined_gridgroup_attr_hdl)  & 
    201     ( gridgroup_hdl, axis_ref, description, domain_ref, group_ref, mask, name ) 
    202      
    203     IMPLICIT NONE 
    204       TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    205       LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref 
    206       LOGICAL(KIND=C_BOOL) :: axis_ref_tmp 
     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 
    207191      LOGICAL, OPTIONAL, INTENT(OUT) :: description 
    208192      LOGICAL(KIND=C_BOOL) :: description_tmp 
    209       LOGICAL, OPTIONAL, INTENT(OUT) :: domain_ref 
    210       LOGICAL(KIND=C_BOOL) :: domain_ref_tmp 
    211193      LOGICAL, OPTIONAL, INTENT(OUT) :: group_ref 
    212194      LOGICAL(KIND=C_BOOL) :: group_ref_tmp 
    … …  
    217199       
    218200      CALL xios(is_defined_gridgroup_attr_hdl_)  & 
    219       ( gridgroup_hdl, axis_ref, description, domain_ref, group_ref, mask, name ) 
     201      ( gridgroup_hdl, axisDomOrder, description, group_ref, mask, name ) 
    220202     
    221203  END SUBROUTINE xios(is_defined_gridgroup_attr_hdl) 
    222204   
    223205  SUBROUTINE xios(is_defined_gridgroup_attr_hdl_)   & 
    224     ( gridgroup_hdl, axis_ref_, description_, domain_ref_, group_ref_, mask_, name_ ) 
    225      
    226     IMPLICIT NONE 
    227       TYPE(txios(gridgroup)) , INTENT(IN) :: gridgroup_hdl 
    228       LOGICAL, OPTIONAL, INTENT(OUT) :: axis_ref_ 
    229       LOGICAL(KIND=C_BOOL) :: axis_ref__tmp 
     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 
    230212      LOGICAL, OPTIONAL, INTENT(OUT) :: description_ 
    231213      LOGICAL(KIND=C_BOOL) :: description__tmp 
    232       LOGICAL, OPTIONAL, INTENT(OUT) :: domain_ref_ 
    233       LOGICAL(KIND=C_BOOL) :: domain_ref__tmp 
    234214      LOGICAL, OPTIONAL, INTENT(OUT) :: group_ref_ 
    235215      LOGICAL(KIND=C_BOOL) :: group_ref__tmp 
    … …  
    239219      LOGICAL(KIND=C_BOOL) :: name__tmp 
    240220       
    241       IF (PRESENT(axis_ref_)) THEN 
    242         axis_ref__tmp=cxios_is_defined_gridgroup_axis_ref(gridgroup_hdl%daddr) 
    243         axis_ref_=axis_ref__tmp 
     221      IF (PRESENT(axisDomOrder_)) THEN 
     222        axisDomOrder__tmp=cxios_is_defined_gridgroup_axisDomOrder(gridgroup_hdl%daddr) 
     223        axisDomOrder_=axisDomOrder__tmp 
    244224      ENDIF 
    245225       
    … …  
    249229      ENDIF 
    250230       
    251       IF (PRESENT(domain_ref_)) THEN 
    252         domain_ref__tmp=cxios_is_defined_gridgroup_domain_ref(gridgroup_hdl%daddr) 
    253         domain_ref_=domain_ref__tmp 
    254       ENDIF 
    255        
    256231      IF (PRESENT(group_ref_)) THEN 
    257232        group_ref__tmp=cxios_is_defined_gridgroup_group_ref(gridgroup_hdl%daddr) 
Note: See TracChangeset for help on using the changeset viewer.