Changeset 1040


Ignore:
Timestamp:
02/01/17 10:10:37 (6 years ago)
Author:
rlacroix
Message:

Update the Fortran interface (some files were forgotten in r1014).

Location:
XIOS/trunk/src/interface/fortran_attr
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r1005 r1040  
    1212 
    1313  SUBROUTINE xios(set_interpolate_domain_attr)  & 
    14     ( interpolate_domain_id, file, mode, order, renormalize, weight_filename, write_weight ) 
     14    ( interpolate_domain_id, mode, order, renormalize, weight_filename, write_weight ) 
    1515 
    1616    IMPLICIT NONE 
    1717      TYPE(txios(interpolate_domain))  :: interpolate_domain_hdl 
    1818      CHARACTER(LEN=*), INTENT(IN) ::interpolate_domain_id 
    19       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: file 
    2019      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: mode 
    2120      INTEGER  , OPTIONAL, INTENT(IN) :: order 
    … …  
    2928      (interpolate_domain_id,interpolate_domain_hdl) 
    3029      CALL xios(set_interpolate_domain_attr_hdl_)   & 
    31       ( interpolate_domain_hdl, file, mode, order, renormalize, weight_filename, write_weight ) 
     30      ( interpolate_domain_hdl, mode, order, renormalize, weight_filename, write_weight ) 
    3231 
    3332  END SUBROUTINE xios(set_interpolate_domain_attr) 
    3433 
    3534  SUBROUTINE xios(set_interpolate_domain_attr_hdl)  & 
    36     ( interpolate_domain_hdl, file, mode, order, renormalize, weight_filename, write_weight ) 
    37  
    38     IMPLICIT NONE 
    39       TYPE(txios(interpolate_domain)) , INTENT(IN) :: interpolate_domain_hdl 
    40       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: file 
     35    ( interpolate_domain_hdl, mode, order, renormalize, weight_filename, write_weight ) 
     36 
     37    IMPLICIT NONE 
     38      TYPE(txios(interpolate_domain)) , INTENT(IN) :: interpolate_domain_hdl 
    4139      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: mode 
    4240      INTEGER  , OPTIONAL, INTENT(IN) :: order 
    … …  
    4846 
    4947      CALL xios(set_interpolate_domain_attr_hdl_)  & 
    50       ( interpolate_domain_hdl, file, mode, order, renormalize, weight_filename, write_weight ) 
     48      ( interpolate_domain_hdl, mode, order, renormalize, weight_filename, write_weight ) 
    5149 
    5250  END SUBROUTINE xios(set_interpolate_domain_attr_hdl) 
    5351 
    5452  SUBROUTINE xios(set_interpolate_domain_attr_hdl_)   & 
    55     ( interpolate_domain_hdl, file_, mode_, order_, renormalize_, weight_filename_, write_weight_  & 
    56      ) 
    57  
    58     IMPLICIT NONE 
    59       TYPE(txios(interpolate_domain)) , INTENT(IN) :: interpolate_domain_hdl 
    60       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: file_ 
     53    ( interpolate_domain_hdl, mode_, order_, renormalize_, weight_filename_, write_weight_ ) 
     54 
     55    IMPLICIT NONE 
     56      TYPE(txios(interpolate_domain)) , INTENT(IN) :: interpolate_domain_hdl 
    6157      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: mode_ 
    6258      INTEGER  , OPTIONAL, INTENT(IN) :: order_ 
    … …  
    6763      LOGICAL (KIND=C_BOOL) :: write_weight__tmp 
    6864 
    69       IF (PRESENT(file_)) THEN 
    70         CALL cxios_set_interpolate_domain_file & 
    71       (interpolate_domain_hdl%daddr, file_, len(file_)) 
    72       ENDIF 
    73  
    7465      IF (PRESENT(mode_)) THEN 
    7566        CALL cxios_set_interpolate_domain_mode & 
    … …  
    10293 
    10394  SUBROUTINE xios(get_interpolate_domain_attr)  & 
    104     ( interpolate_domain_id, file, mode, order, renormalize, weight_filename, write_weight ) 
     95    ( interpolate_domain_id, mode, order, renormalize, weight_filename, write_weight ) 
    10596 
    10697    IMPLICIT NONE 
    10798      TYPE(txios(interpolate_domain))  :: interpolate_domain_hdl 
    10899      CHARACTER(LEN=*), INTENT(IN) ::interpolate_domain_id 
    109       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: file 
    110100      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: mode 
    111101      INTEGER  , OPTIONAL, INTENT(OUT) :: order 
    … …  
    119109      (interpolate_domain_id,interpolate_domain_hdl) 
    120110      CALL xios(get_interpolate_domain_attr_hdl_)   & 
    121       ( interpolate_domain_hdl, file, mode, order, renormalize, weight_filename, write_weight ) 
     111      ( interpolate_domain_hdl, mode, order, renormalize, weight_filename, write_weight ) 
    122112 
    123113  END SUBROUTINE xios(get_interpolate_domain_attr) 
    124114 
    125115  SUBROUTINE xios(get_interpolate_domain_attr_hdl)  & 
    126     ( interpolate_domain_hdl, file, mode, order, renormalize, weight_filename, write_weight ) 
    127  
    128     IMPLICIT NONE 
    129       TYPE(txios(interpolate_domain)) , INTENT(IN) :: interpolate_domain_hdl 
    130       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: file 
     116    ( interpolate_domain_hdl, mode, order, renormalize, weight_filename, write_weight ) 
     117 
     118    IMPLICIT NONE 
     119      TYPE(txios(interpolate_domain)) , INTENT(IN) :: interpolate_domain_hdl 
    131120      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: mode 
    132121      INTEGER  , OPTIONAL, INTENT(OUT) :: order 
    … …  
    138127 
    139128      CALL xios(get_interpolate_domain_attr_hdl_)  & 
    140       ( interpolate_domain_hdl, file, mode, order, renormalize, weight_filename, write_weight ) 
     129      ( interpolate_domain_hdl, mode, order, renormalize, weight_filename, write_weight ) 
    141130 
    142131  END SUBROUTINE xios(get_interpolate_domain_attr_hdl) 
    143132 
    144133  SUBROUTINE xios(get_interpolate_domain_attr_hdl_)   & 
    145     ( interpolate_domain_hdl, file_, mode_, order_, renormalize_, weight_filename_, write_weight_  & 
    146      ) 
    147  
    148     IMPLICIT NONE 
    149       TYPE(txios(interpolate_domain)) , INTENT(IN) :: interpolate_domain_hdl 
    150       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: file_ 
     134    ( interpolate_domain_hdl, mode_, order_, renormalize_, weight_filename_, write_weight_ ) 
     135 
     136    IMPLICIT NONE 
     137      TYPE(txios(interpolate_domain)) , INTENT(IN) :: interpolate_domain_hdl 
    151138      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: mode_ 
    152139      INTEGER  , OPTIONAL, INTENT(OUT) :: order_ 
    … …  
    157144      LOGICAL (KIND=C_BOOL) :: write_weight__tmp 
    158145 
    159       IF (PRESENT(file_)) THEN 
    160         CALL cxios_get_interpolate_domain_file & 
    161       (interpolate_domain_hdl%daddr, file_, len(file_)) 
    162       ENDIF 
    163  
    164146      IF (PRESENT(mode_)) THEN 
    165147        CALL cxios_get_interpolate_domain_mode & 
    … …  
    192174 
    193175  SUBROUTINE xios(is_defined_interpolate_domain_attr)  & 
    194     ( interpolate_domain_id, file, mode, order, renormalize, weight_filename, write_weight ) 
     176    ( interpolate_domain_id, mode, order, renormalize, weight_filename, write_weight ) 
    195177 
    196178    IMPLICIT NONE 
    197179      TYPE(txios(interpolate_domain))  :: interpolate_domain_hdl 
    198180      CHARACTER(LEN=*), INTENT(IN) ::interpolate_domain_id 
    199       LOGICAL, OPTIONAL, INTENT(OUT) :: file 
    200       LOGICAL(KIND=C_BOOL) :: file_tmp 
    201181      LOGICAL, OPTIONAL, INTENT(OUT) :: mode 
    202182      LOGICAL(KIND=C_BOOL) :: mode_tmp 
    … …  
    213193      (interpolate_domain_id,interpolate_domain_hdl) 
    214194      CALL xios(is_defined_interpolate_domain_attr_hdl_)   & 
    215       ( interpolate_domain_hdl, file, mode, order, renormalize, weight_filename, write_weight ) 
     195      ( interpolate_domain_hdl, mode, order, renormalize, weight_filename, write_weight ) 
    216196 
    217197  END SUBROUTINE xios(is_defined_interpolate_domain_attr) 
    218198 
    219199  SUBROUTINE xios(is_defined_interpolate_domain_attr_hdl)  & 
    220     ( interpolate_domain_hdl, file, mode, order, renormalize, weight_filename, write_weight ) 
    221  
    222     IMPLICIT NONE 
    223       TYPE(txios(interpolate_domain)) , INTENT(IN) :: interpolate_domain_hdl 
    224       LOGICAL, OPTIONAL, INTENT(OUT) :: file 
    225       LOGICAL(KIND=C_BOOL) :: file_tmp 
     200    ( interpolate_domain_hdl, mode, order, renormalize, weight_filename, write_weight ) 
     201 
     202    IMPLICIT NONE 
     203      TYPE(txios(interpolate_domain)) , INTENT(IN) :: interpolate_domain_hdl 
    226204      LOGICAL, OPTIONAL, INTENT(OUT) :: mode 
    227205      LOGICAL(KIND=C_BOOL) :: mode_tmp 
    … …  
    236214 
    237215      CALL xios(is_defined_interpolate_domain_attr_hdl_)  & 
    238       ( interpolate_domain_hdl, file, mode, order, renormalize, weight_filename, write_weight ) 
     216      ( interpolate_domain_hdl, mode, order, renormalize, weight_filename, write_weight ) 
    239217 
    240218  END SUBROUTINE xios(is_defined_interpolate_domain_attr_hdl) 
    241219 
    242220  SUBROUTINE xios(is_defined_interpolate_domain_attr_hdl_)   & 
    243     ( interpolate_domain_hdl, file_, mode_, order_, renormalize_, weight_filename_, write_weight_  & 
    244      ) 
    245  
    246     IMPLICIT NONE 
    247       TYPE(txios(interpolate_domain)) , INTENT(IN) :: interpolate_domain_hdl 
    248       LOGICAL, OPTIONAL, INTENT(OUT) :: file_ 
    249       LOGICAL(KIND=C_BOOL) :: file__tmp 
     221    ( interpolate_domain_hdl, mode_, order_, renormalize_, weight_filename_, write_weight_ ) 
     222 
     223    IMPLICIT NONE 
     224      TYPE(txios(interpolate_domain)) , INTENT(IN) :: interpolate_domain_hdl 
    250225      LOGICAL, OPTIONAL, INTENT(OUT) :: mode_ 
    251226      LOGICAL(KIND=C_BOOL) :: mode__tmp 
    … …  
    259234      LOGICAL(KIND=C_BOOL) :: write_weight__tmp 
    260235 
    261       IF (PRESENT(file_)) THEN 
    262         file__tmp = cxios_is_defined_interpolate_domain_file & 
    263       (interpolate_domain_hdl%daddr) 
    264         file_ = file__tmp 
    265       ENDIF 
    266  
    267236      IF (PRESENT(mode_)) THEN 
    268237        mode__tmp = cxios_is_defined_interpolate_domain_mode & 

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

    r1005 r1040  
    99  INTERFACE 
    1010    ! Do not call directly / interface FORTRAN 2003 <-> C99 
    11  
    12     SUBROUTINE cxios_set_interpolate_domain_file(interpolate_domain_hdl, file, file_size) BIND(C) 
    13       USE ISO_C_BINDING 
    14       INTEGER (kind = C_INTPTR_T), VALUE :: interpolate_domain_hdl 
    15       CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: file 
    16       INTEGER  (kind = C_INT)     , VALUE        :: file_size 
    17     END SUBROUTINE cxios_set_interpolate_domain_file 
    18  
    19     SUBROUTINE cxios_get_interpolate_domain_file(interpolate_domain_hdl, file, file_size) BIND(C) 
    20       USE ISO_C_BINDING 
    21       INTEGER (kind = C_INTPTR_T), VALUE :: interpolate_domain_hdl 
    22       CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: file 
    23       INTEGER  (kind = C_INT)     , VALUE        :: file_size 
    24     END SUBROUTINE cxios_get_interpolate_domain_file 
    25  
    26     FUNCTION cxios_is_defined_interpolate_domain_file(interpolate_domain_hdl) BIND(C) 
    27       USE ISO_C_BINDING 
    28       LOGICAL(kind=C_BOOL) :: cxios_is_defined_interpolate_domain_file 
    29       INTEGER (kind = C_INTPTR_T), VALUE :: interpolate_domain_hdl 
    30     END FUNCTION cxios_is_defined_interpolate_domain_file 
    31  
    3211 
    3312    SUBROUTINE cxios_set_interpolate_domain_mode(interpolate_domain_hdl, mode, mode_size) BIND(C) 
Note: See TracChangeset for help on using the changeset viewer.