Changeset 779


Ignore:
Timestamp:
11/04/15 15:50:20 (8 years ago)
Author:
rlacroix
Message:

Update the Fortran API.

It had been forgotten in recent changes.

Location:
XIOS/trunk/src/interface
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • XIOS/trunk/src/interface/c_attr/icaxis_attr.cpp

    r674 r779  
    237237 
    238238 
     239  void cxios_set_axis_n_distributed_partition(axis_Ptr axis_hdl, int n_distributed_partition) 
     240  { 
     241    CTimer::get("XIOS").resume(); 
     242    axis_hdl->n_distributed_partition.setValue(n_distributed_partition); 
     243    CTimer::get("XIOS").suspend(); 
     244  } 
     245 
     246  void cxios_get_axis_n_distributed_partition(axis_Ptr axis_hdl, int* n_distributed_partition) 
     247  { 
     248    CTimer::get("XIOS").resume(); 
     249    *n_distributed_partition = axis_hdl->n_distributed_partition.getInheritedValue(); 
     250    CTimer::get("XIOS").suspend(); 
     251  } 
     252 
     253  bool cxios_is_defined_axis_n_distributed_partition(axis_Ptr axis_hdl) 
     254  { 
     255     CTimer::get("XIOS").resume(); 
     256     bool isDefined = axis_hdl->n_distributed_partition.hasInheritedValue(); 
     257     CTimer::get("XIOS").suspend(); 
     258     return isDefined; 
     259  } 
     260 
     261 
    239262  void cxios_set_axis_n_glo(axis_Ptr axis_hdl, int n_glo) 
    240263  { 

  • XIOS/trunk/src/interface/c_attr/icaxisgroup_attr.cpp

    r674 r779  
    263263 
    264264 
     265  void cxios_set_axisgroup_n_distributed_partition(axisgroup_Ptr axisgroup_hdl, int n_distributed_partition) 
     266  { 
     267    CTimer::get("XIOS").resume(); 
     268    axisgroup_hdl->n_distributed_partition.setValue(n_distributed_partition); 
     269    CTimer::get("XIOS").suspend(); 
     270  } 
     271 
     272  void cxios_get_axisgroup_n_distributed_partition(axisgroup_Ptr axisgroup_hdl, int* n_distributed_partition) 
     273  { 
     274    CTimer::get("XIOS").resume(); 
     275    *n_distributed_partition = axisgroup_hdl->n_distributed_partition.getInheritedValue(); 
     276    CTimer::get("XIOS").suspend(); 
     277  } 
     278 
     279  bool cxios_is_defined_axisgroup_n_distributed_partition(axisgroup_Ptr axisgroup_hdl) 
     280  { 
     281     CTimer::get("XIOS").resume(); 
     282     bool isDefined = axisgroup_hdl->n_distributed_partition.hasInheritedValue(); 
     283     CTimer::get("XIOS").suspend(); 
     284     return isDefined; 
     285  } 
     286 
     287 
    265288  void cxios_set_axisgroup_n_glo(axisgroup_Ptr axisgroup_hdl, int n_glo) 
    266289  { 

  • XIOS/trunk/src/interface/c_attr/icfile_attr.cpp

    r711 r779  
    327327 
    328328 
     329  void cxios_set_file_record_offset(file_Ptr file_hdl, int record_offset) 
     330  { 
     331    CTimer::get("XIOS").resume(); 
     332    file_hdl->record_offset.setValue(record_offset); 
     333    CTimer::get("XIOS").suspend(); 
     334  } 
     335 
     336  void cxios_get_file_record_offset(file_Ptr file_hdl, int* record_offset) 
     337  { 
     338    CTimer::get("XIOS").resume(); 
     339    *record_offset = file_hdl->record_offset.getInheritedValue(); 
     340    CTimer::get("XIOS").suspend(); 
     341  } 
     342 
     343  bool cxios_is_defined_file_record_offset(file_Ptr file_hdl) 
     344  { 
     345     CTimer::get("XIOS").resume(); 
     346     bool isDefined = file_hdl->record_offset.hasInheritedValue(); 
     347     CTimer::get("XIOS").suspend(); 
     348     return isDefined; 
     349  } 
     350 
     351 
    329352  void cxios_set_file_split_freq(file_Ptr file_hdl, cxios_duration split_freq_c) 
    330353  { 

  • XIOS/trunk/src/interface/c_attr/icfilegroup_attr.cpp

    r711 r779  
    353353 
    354354 
     355  void cxios_set_filegroup_record_offset(filegroup_Ptr filegroup_hdl, int record_offset) 
     356  { 
     357    CTimer::get("XIOS").resume(); 
     358    filegroup_hdl->record_offset.setValue(record_offset); 
     359    CTimer::get("XIOS").suspend(); 
     360  } 
     361 
     362  void cxios_get_filegroup_record_offset(filegroup_Ptr filegroup_hdl, int* record_offset) 
     363  { 
     364    CTimer::get("XIOS").resume(); 
     365    *record_offset = filegroup_hdl->record_offset.getInheritedValue(); 
     366    CTimer::get("XIOS").suspend(); 
     367  } 
     368 
     369  bool cxios_is_defined_filegroup_record_offset(filegroup_Ptr filegroup_hdl) 
     370  { 
     371     CTimer::get("XIOS").resume(); 
     372     bool isDefined = filegroup_hdl->record_offset.hasInheritedValue(); 
     373     CTimer::get("XIOS").suspend(); 
     374     return isDefined; 
     375  } 
     376 
     377 
    355378  void cxios_set_filegroup_split_freq(filegroup_Ptr filegroup_hdl, cxios_duration split_freq_c) 
    356379  { 

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

    r674 r779  
    191191 
    192192 
     193    SUBROUTINE cxios_set_axis_n_distributed_partition(axis_hdl, n_distributed_partition) BIND(C) 
     194      USE ISO_C_BINDING 
     195      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 
     196      INTEGER (KIND=C_INT)      , VALUE :: n_distributed_partition 
     197    END SUBROUTINE cxios_set_axis_n_distributed_partition 
     198 
     199    SUBROUTINE cxios_get_axis_n_distributed_partition(axis_hdl, n_distributed_partition) BIND(C) 
     200      USE ISO_C_BINDING 
     201      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 
     202      INTEGER (KIND=C_INT)             :: n_distributed_partition 
     203    END SUBROUTINE cxios_get_axis_n_distributed_partition 
     204 
     205    FUNCTION cxios_is_defined_axis_n_distributed_partition(axis_hdl) BIND(C) 
     206      USE ISO_C_BINDING 
     207      LOGICAL(kind=C_BOOL) :: cxios_is_defined_axis_n_distributed_partition 
     208      INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 
     209    END FUNCTION cxios_is_defined_axis_n_distributed_partition 
     210 
     211 
    193212    SUBROUTINE cxios_set_axis_n_glo(axis_hdl, n_glo) BIND(C) 
    194213      USE ISO_C_BINDING 

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

    r674 r779  
    212212 
    213213 
     214    SUBROUTINE cxios_set_axisgroup_n_distributed_partition(axisgroup_hdl, n_distributed_partition) BIND(C) 
     215      USE ISO_C_BINDING 
     216      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 
     217      INTEGER (KIND=C_INT)      , VALUE :: n_distributed_partition 
     218    END SUBROUTINE cxios_set_axisgroup_n_distributed_partition 
     219 
     220    SUBROUTINE cxios_get_axisgroup_n_distributed_partition(axisgroup_hdl, n_distributed_partition) BIND(C) 
     221      USE ISO_C_BINDING 
     222      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 
     223      INTEGER (KIND=C_INT)             :: n_distributed_partition 
     224    END SUBROUTINE cxios_get_axisgroup_n_distributed_partition 
     225 
     226    FUNCTION cxios_is_defined_axisgroup_n_distributed_partition(axisgroup_hdl) BIND(C) 
     227      USE ISO_C_BINDING 
     228      LOGICAL(kind=C_BOOL) :: cxios_is_defined_axisgroup_n_distributed_partition 
     229      INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 
     230    END FUNCTION cxios_is_defined_axisgroup_n_distributed_partition 
     231 
     232 
    214233    SUBROUTINE cxios_set_axisgroup_n_glo(axisgroup_hdl, n_glo) BIND(C) 
    215234      USE ISO_C_BINDING 

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

    r711 r779  
    252252 
    253253 
     254    SUBROUTINE cxios_set_file_record_offset(file_hdl, record_offset) BIND(C) 
     255      USE ISO_C_BINDING 
     256      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     257      INTEGER (KIND=C_INT)      , VALUE :: record_offset 
     258    END SUBROUTINE cxios_set_file_record_offset 
     259 
     260    SUBROUTINE cxios_get_file_record_offset(file_hdl, record_offset) BIND(C) 
     261      USE ISO_C_BINDING 
     262      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     263      INTEGER (KIND=C_INT)             :: record_offset 
     264    END SUBROUTINE cxios_get_file_record_offset 
     265 
     266    FUNCTION cxios_is_defined_file_record_offset(file_hdl) BIND(C) 
     267      USE ISO_C_BINDING 
     268      LOGICAL(kind=C_BOOL) :: cxios_is_defined_file_record_offset 
     269      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
     270    END FUNCTION cxios_is_defined_file_record_offset 
     271 
     272 
    254273    SUBROUTINE cxios_set_file_split_freq(file_hdl, split_freq) BIND(C) 
    255274      USE ISO_C_BINDING 

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

    r711 r779  
    273273 
    274274 
     275    SUBROUTINE cxios_set_filegroup_record_offset(filegroup_hdl, record_offset) BIND(C) 
     276      USE ISO_C_BINDING 
     277      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     278      INTEGER (KIND=C_INT)      , VALUE :: record_offset 
     279    END SUBROUTINE cxios_set_filegroup_record_offset 
     280 
     281    SUBROUTINE cxios_get_filegroup_record_offset(filegroup_hdl, record_offset) BIND(C) 
     282      USE ISO_C_BINDING 
     283      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     284      INTEGER (KIND=C_INT)             :: record_offset 
     285    END SUBROUTINE cxios_get_filegroup_record_offset 
     286 
     287    FUNCTION cxios_is_defined_filegroup_record_offset(filegroup_hdl) BIND(C) 
     288      USE ISO_C_BINDING 
     289      LOGICAL(kind=C_BOOL) :: cxios_is_defined_filegroup_record_offset 
     290      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
     291    END FUNCTION cxios_is_defined_filegroup_record_offset 
     292 
     293 
    275294    SUBROUTINE cxios_set_filegroup_split_freq(filegroup_hdl, split_freq) BIND(C) 
    276295      USE ISO_C_BINDING 

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

    r674 r779  
    1212 
    1313  SUBROUTINE xios(set_axis_attr)  & 
    14     ( axis_id, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_glo  & 
    15     , name, positive, standard_name, unit, value ) 
     14    ( axis_id, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_distributed_partition  & 
     15    , n_glo, name, positive, standard_name, unit, value ) 
    1616 
    1717    IMPLICIT NONE 
    … …  
    2828      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:) 
    2929      INTEGER  , OPTIONAL, INTENT(IN) :: n 
     30      INTEGER  , OPTIONAL, INTENT(IN) :: n_distributed_partition 
    3031      INTEGER  , OPTIONAL, INTENT(IN) :: n_glo 
    3132      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name 
    … …  
    3738      CALL xios(get_axis_handle)(axis_id,axis_hdl) 
    3839      CALL xios(set_axis_attr_hdl_)   & 
    39       ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_glo  & 
    40       , name, positive, standard_name, unit, value ) 
     40      ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_distributed_partition  & 
     41      , n_glo, name, positive, standard_name, unit, value ) 
    4142 
    4243  END SUBROUTINE xios(set_axis_attr) 
    4344 
    4445  SUBROUTINE xios(set_axis_attr_hdl)  & 
    45     ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_glo  & 
    46     , name, positive, standard_name, unit, value ) 
     46    ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_distributed_partition  & 
     47    , n_glo, name, positive, standard_name, unit, value ) 
    4748 
    4849    IMPLICIT NONE 
    … …  
    5859      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:) 
    5960      INTEGER  , OPTIONAL, INTENT(IN) :: n 
     61      INTEGER  , OPTIONAL, INTENT(IN) :: n_distributed_partition 
    6062      INTEGER  , OPTIONAL, INTENT(IN) :: n_glo 
    6163      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name 
    … …  
    6668 
    6769      CALL xios(set_axis_attr_hdl_)  & 
    68       ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_glo  & 
    69       , name, positive, standard_name, unit, value ) 
     70      ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_distributed_partition  & 
     71      , n_glo, name, positive, standard_name, unit, value ) 
    7072 
    7173  END SUBROUTINE xios(set_axis_attr_hdl) 
    … …  
    7375  SUBROUTINE xios(set_axis_attr_hdl_)   & 
    7476    ( axis_hdl, axis_ref_, begin_, bounds_, data_begin_, data_index_, data_n_, long_name_, mask_  & 
    75     , n_, n_glo_, name_, positive_, standard_name_, unit_, value_ ) 
     77    , n_, n_distributed_partition_, n_glo_, name_, positive_, standard_name_, unit_, value_ ) 
    7678 
    7779    IMPLICIT NONE 
    … …  
    8789      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask__tmp(:) 
    8890      INTEGER  , OPTIONAL, INTENT(IN) :: n_ 
     91      INTEGER  , OPTIONAL, INTENT(IN) :: n_distributed_partition_ 
    8992      INTEGER  , OPTIONAL, INTENT(IN) :: n_glo_ 
    9093      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name_ 
    … …  
    132135      ENDIF 
    133136 
     137      IF (PRESENT(n_distributed_partition_)) THEN 
     138        CALL cxios_set_axis_n_distributed_partition(axis_hdl%daddr, n_distributed_partition_) 
     139      ENDIF 
     140 
    134141      IF (PRESENT(n_glo_)) THEN 
    135142        CALL cxios_set_axis_n_glo(axis_hdl%daddr, n_glo_) 
    … …  
    159166 
    160167  SUBROUTINE xios(get_axis_attr)  & 
    161     ( axis_id, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_glo  & 
    162     , name, positive, standard_name, unit, value ) 
     168    ( axis_id, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_distributed_partition  & 
     169    , n_glo, name, positive, standard_name, unit, value ) 
    163170 
    164171    IMPLICIT NONE 
    … …  
    175182      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:) 
    176183      INTEGER  , OPTIONAL, INTENT(OUT) :: n 
     184      INTEGER  , OPTIONAL, INTENT(OUT) :: n_distributed_partition 
    177185      INTEGER  , OPTIONAL, INTENT(OUT) :: n_glo 
    178186      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name 
    … …  
    184192      CALL xios(get_axis_handle)(axis_id,axis_hdl) 
    185193      CALL xios(get_axis_attr_hdl_)   & 
    186       ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_glo  & 
    187       , name, positive, standard_name, unit, value ) 
     194      ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_distributed_partition  & 
     195      , n_glo, name, positive, standard_name, unit, value ) 
    188196 
    189197  END SUBROUTINE xios(get_axis_attr) 
    190198 
    191199  SUBROUTINE xios(get_axis_attr_hdl)  & 
    192     ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_glo  & 
    193     , name, positive, standard_name, unit, value ) 
     200    ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_distributed_partition  & 
     201    , n_glo, name, positive, standard_name, unit, value ) 
    194202 
    195203    IMPLICIT NONE 
    … …  
    205213      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:) 
    206214      INTEGER  , OPTIONAL, INTENT(OUT) :: n 
     215      INTEGER  , OPTIONAL, INTENT(OUT) :: n_distributed_partition 
    207216      INTEGER  , OPTIONAL, INTENT(OUT) :: n_glo 
    208217      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name 
    … …  
    213222 
    214223      CALL xios(get_axis_attr_hdl_)  & 
    215       ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_glo  & 
    216       , name, positive, standard_name, unit, value ) 
     224      ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_distributed_partition  & 
     225      , n_glo, name, positive, standard_name, unit, value ) 
    217226 
    218227  END SUBROUTINE xios(get_axis_attr_hdl) 
    … …  
    220229  SUBROUTINE xios(get_axis_attr_hdl_)   & 
    221230    ( axis_hdl, axis_ref_, begin_, bounds_, data_begin_, data_index_, data_n_, long_name_, mask_  & 
    222     , n_, n_glo_, name_, positive_, standard_name_, unit_, value_ ) 
     231    , n_, n_distributed_partition_, n_glo_, name_, positive_, standard_name_, unit_, value_ ) 
    223232 
    224233    IMPLICIT NONE 
    … …  
    234243      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask__tmp(:) 
    235244      INTEGER  , OPTIONAL, INTENT(OUT) :: n_ 
     245      INTEGER  , OPTIONAL, INTENT(OUT) :: n_distributed_partition_ 
    236246      INTEGER  , OPTIONAL, INTENT(OUT) :: n_glo_ 
    237247      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name_ 
    … …  
    279289      ENDIF 
    280290 
     291      IF (PRESENT(n_distributed_partition_)) THEN 
     292        CALL cxios_get_axis_n_distributed_partition(axis_hdl%daddr, n_distributed_partition_) 
     293      ENDIF 
     294 
    281295      IF (PRESENT(n_glo_)) THEN 
    282296        CALL cxios_get_axis_n_glo(axis_hdl%daddr, n_glo_) 
    … …  
    306320 
    307321  SUBROUTINE xios(is_defined_axis_attr)  & 
    308     ( axis_id, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_glo  & 
    309     , name, positive, standard_name, unit, value ) 
     322    ( axis_id, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_distributed_partition  & 
     323    , n_glo, name, positive, standard_name, unit, value ) 
    310324 
    311325    IMPLICIT NONE 
    … …  
    330344      LOGICAL, OPTIONAL, INTENT(OUT) :: n 
    331345      LOGICAL(KIND=C_BOOL) :: n_tmp 
     346      LOGICAL, OPTIONAL, INTENT(OUT) :: n_distributed_partition 
     347      LOGICAL(KIND=C_BOOL) :: n_distributed_partition_tmp 
    332348      LOGICAL, OPTIONAL, INTENT(OUT) :: n_glo 
    333349      LOGICAL(KIND=C_BOOL) :: n_glo_tmp 
    … …  
    345361      CALL xios(get_axis_handle)(axis_id,axis_hdl) 
    346362      CALL xios(is_defined_axis_attr_hdl_)   & 
    347       ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_glo  & 
    348       , name, positive, standard_name, unit, value ) 
     363      ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_distributed_partition  & 
     364      , n_glo, name, positive, standard_name, unit, value ) 
    349365 
    350366  END SUBROUTINE xios(is_defined_axis_attr) 
    351367 
    352368  SUBROUTINE xios(is_defined_axis_attr_hdl)  & 
    353     ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_glo  & 
    354     , name, positive, standard_name, unit, value ) 
     369    ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_distributed_partition  & 
     370    , n_glo, name, positive, standard_name, unit, value ) 
    355371 
    356372    IMPLICIT NONE 
    … …  
    374390      LOGICAL, OPTIONAL, INTENT(OUT) :: n 
    375391      LOGICAL(KIND=C_BOOL) :: n_tmp 
     392      LOGICAL, OPTIONAL, INTENT(OUT) :: n_distributed_partition 
     393      LOGICAL(KIND=C_BOOL) :: n_distributed_partition_tmp 
    376394      LOGICAL, OPTIONAL, INTENT(OUT) :: n_glo 
    377395      LOGICAL(KIND=C_BOOL) :: n_glo_tmp 
    … …  
    388406 
    389407      CALL xios(is_defined_axis_attr_hdl_)  & 
    390       ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_glo  & 
    391       , name, positive, standard_name, unit, value ) 
     408      ( axis_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, long_name, mask, n, n_distributed_partition  & 
     409      , n_glo, name, positive, standard_name, unit, value ) 
    392410 
    393411  END SUBROUTINE xios(is_defined_axis_attr_hdl) 
    … …  
    395413  SUBROUTINE xios(is_defined_axis_attr_hdl_)   & 
    396414    ( axis_hdl, axis_ref_, begin_, bounds_, data_begin_, data_index_, data_n_, long_name_, mask_  & 
    397     , n_, n_glo_, name_, positive_, standard_name_, unit_, value_ ) 
     415    , n_, n_distributed_partition_, n_glo_, name_, positive_, standard_name_, unit_, value_ ) 
    398416 
    399417    IMPLICIT NONE 
    … …  
    417435      LOGICAL, OPTIONAL, INTENT(OUT) :: n_ 
    418436      LOGICAL(KIND=C_BOOL) :: n__tmp 
     437      LOGICAL, OPTIONAL, INTENT(OUT) :: n_distributed_partition_ 
     438      LOGICAL(KIND=C_BOOL) :: n_distributed_partition__tmp 
    419439      LOGICAL, OPTIONAL, INTENT(OUT) :: n_glo_ 
    420440      LOGICAL(KIND=C_BOOL) :: n_glo__tmp 
    … …  
    475495      ENDIF 
    476496 
     497      IF (PRESENT(n_distributed_partition_)) THEN 
     498        n_distributed_partition__tmp = cxios_is_defined_axis_n_distributed_partition(axis_hdl%daddr) 
     499        n_distributed_partition_ = n_distributed_partition__tmp 
     500      ENDIF 
     501 
    477502      IF (PRESENT(n_glo_)) THEN 
    478503        n_glo__tmp = cxios_is_defined_axis_n_glo(axis_hdl%daddr) 

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

    r674 r779  
    1313  SUBROUTINE xios(set_axisgroup_attr)  & 
    1414    ( axisgroup_id, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, long_name  & 
    15     , mask, n, n_glo, name, positive, standard_name, unit, value ) 
     15    , mask, n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
    1616 
    1717    IMPLICIT NONE 
    … …  
    2929      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:) 
    3030      INTEGER  , OPTIONAL, INTENT(IN) :: n 
     31      INTEGER  , OPTIONAL, INTENT(IN) :: n_distributed_partition 
    3132      INTEGER  , OPTIONAL, INTENT(IN) :: n_glo 
    3233      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name 
    … …  
    3940      CALL xios(set_axisgroup_attr_hdl_)   & 
    4041      ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, long_name  & 
    41       , mask, n, n_glo, name, positive, standard_name, unit, value ) 
     42      , mask, n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
    4243 
    4344  END SUBROUTINE xios(set_axisgroup_attr) 
    … …  
    4546  SUBROUTINE xios(set_axisgroup_attr_hdl)  & 
    4647    ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, long_name  & 
    47     , mask, n, n_glo, name, positive, standard_name, unit, value ) 
     48    , mask, n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
    4849 
    4950    IMPLICIT NONE 
    … …  
    6061      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:) 
    6162      INTEGER  , OPTIONAL, INTENT(IN) :: n 
     63      INTEGER  , OPTIONAL, INTENT(IN) :: n_distributed_partition 
    6264      INTEGER  , OPTIONAL, INTENT(IN) :: n_glo 
    6365      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name 
    … …  
    6971      CALL xios(set_axisgroup_attr_hdl_)  & 
    7072      ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, long_name  & 
    71       , mask, n, n_glo, name, positive, standard_name, unit, value ) 
     73      , mask, n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
    7274 
    7375  END SUBROUTINE xios(set_axisgroup_attr_hdl) 
    … …  
    7577  SUBROUTINE xios(set_axisgroup_attr_hdl_)   & 
    7678    ( axisgroup_hdl, axis_ref_, begin_, bounds_, data_begin_, data_index_, data_n_, group_ref_, long_name_  & 
    77     , mask_, n_, n_glo_, name_, positive_, standard_name_, unit_, value_ ) 
     79    , mask_, n_, n_distributed_partition_, n_glo_, name_, positive_, standard_name_, unit_, value_  & 
     80     ) 
    7881 
    7982    IMPLICIT NONE 
    … …  
    9093      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask__tmp(:) 
    9194      INTEGER  , OPTIONAL, INTENT(IN) :: n_ 
     95      INTEGER  , OPTIONAL, INTENT(IN) :: n_distributed_partition_ 
    9296      INTEGER  , OPTIONAL, INTENT(IN) :: n_glo_ 
    9397      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: name_ 
    … …  
    139143      ENDIF 
    140144 
     145      IF (PRESENT(n_distributed_partition_)) THEN 
     146        CALL cxios_set_axisgroup_n_distributed_partition(axisgroup_hdl%daddr, n_distributed_partition_) 
     147      ENDIF 
     148 
    141149      IF (PRESENT(n_glo_)) THEN 
    142150        CALL cxios_set_axisgroup_n_glo(axisgroup_hdl%daddr, n_glo_) 
    … …  
    167175  SUBROUTINE xios(get_axisgroup_attr)  & 
    168176    ( axisgroup_id, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, long_name  & 
    169     , mask, n, n_glo, name, positive, standard_name, unit, value ) 
     177    , mask, n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
    170178 
    171179    IMPLICIT NONE 
    … …  
    183191      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:) 
    184192      INTEGER  , OPTIONAL, INTENT(OUT) :: n 
     193      INTEGER  , OPTIONAL, INTENT(OUT) :: n_distributed_partition 
    185194      INTEGER  , OPTIONAL, INTENT(OUT) :: n_glo 
    186195      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name 
    … …  
    193202      CALL xios(get_axisgroup_attr_hdl_)   & 
    194203      ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, long_name  & 
    195       , mask, n, n_glo, name, positive, standard_name, unit, value ) 
     204      , mask, n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
    196205 
    197206  END SUBROUTINE xios(get_axisgroup_attr) 
    … …  
    199208  SUBROUTINE xios(get_axisgroup_attr_hdl)  & 
    200209    ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, long_name  & 
    201     , mask, n, n_glo, name, positive, standard_name, unit, value ) 
     210    , mask, n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
    202211 
    203212    IMPLICIT NONE 
    … …  
    214223      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask_tmp(:) 
    215224      INTEGER  , OPTIONAL, INTENT(OUT) :: n 
     225      INTEGER  , OPTIONAL, INTENT(OUT) :: n_distributed_partition 
    216226      INTEGER  , OPTIONAL, INTENT(OUT) :: n_glo 
    217227      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name 
    … …  
    223233      CALL xios(get_axisgroup_attr_hdl_)  & 
    224234      ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, long_name  & 
    225       , mask, n, n_glo, name, positive, standard_name, unit, value ) 
     235      , mask, n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
    226236 
    227237  END SUBROUTINE xios(get_axisgroup_attr_hdl) 
    … …  
    229239  SUBROUTINE xios(get_axisgroup_attr_hdl_)   & 
    230240    ( axisgroup_hdl, axis_ref_, begin_, bounds_, data_begin_, data_index_, data_n_, group_ref_, long_name_  & 
    231     , mask_, n_, n_glo_, name_, positive_, standard_name_, unit_, value_ ) 
     241    , mask_, n_, n_distributed_partition_, n_glo_, name_, positive_, standard_name_, unit_, value_  & 
     242     ) 
    232243 
    233244    IMPLICIT NONE 
    … …  
    244255      LOGICAL (KIND=C_BOOL) , ALLOCATABLE :: mask__tmp(:) 
    245256      INTEGER  , OPTIONAL, INTENT(OUT) :: n_ 
     257      INTEGER  , OPTIONAL, INTENT(OUT) :: n_distributed_partition_ 
    246258      INTEGER  , OPTIONAL, INTENT(OUT) :: n_glo_ 
    247259      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: name_ 
    … …  
    293305      ENDIF 
    294306 
     307      IF (PRESENT(n_distributed_partition_)) THEN 
     308        CALL cxios_get_axisgroup_n_distributed_partition(axisgroup_hdl%daddr, n_distributed_partition_) 
     309      ENDIF 
     310 
    295311      IF (PRESENT(n_glo_)) THEN 
    296312        CALL cxios_get_axisgroup_n_glo(axisgroup_hdl%daddr, n_glo_) 
    … …  
    321337  SUBROUTINE xios(is_defined_axisgroup_attr)  & 
    322338    ( axisgroup_id, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, long_name  & 
    323     , mask, n, n_glo, name, positive, standard_name, unit, value ) 
     339    , mask, n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
    324340 
    325341    IMPLICIT NONE 
    … …  
    346362      LOGICAL, OPTIONAL, INTENT(OUT) :: n 
    347363      LOGICAL(KIND=C_BOOL) :: n_tmp 
     364      LOGICAL, OPTIONAL, INTENT(OUT) :: n_distributed_partition 
     365      LOGICAL(KIND=C_BOOL) :: n_distributed_partition_tmp 
    348366      LOGICAL, OPTIONAL, INTENT(OUT) :: n_glo 
    349367      LOGICAL(KIND=C_BOOL) :: n_glo_tmp 
    … …  
    362380      CALL xios(is_defined_axisgroup_attr_hdl_)   & 
    363381      ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, long_name  & 
    364       , mask, n, n_glo, name, positive, standard_name, unit, value ) 
     382      , mask, n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
    365383 
    366384  END SUBROUTINE xios(is_defined_axisgroup_attr) 
    … …  
    368386  SUBROUTINE xios(is_defined_axisgroup_attr_hdl)  & 
    369387    ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, long_name  & 
    370     , mask, n, n_glo, name, positive, standard_name, unit, value ) 
     388    , mask, n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
    371389 
    372390    IMPLICIT NONE 
    … …  
    392410      LOGICAL, OPTIONAL, INTENT(OUT) :: n 
    393411      LOGICAL(KIND=C_BOOL) :: n_tmp 
     412      LOGICAL, OPTIONAL, INTENT(OUT) :: n_distributed_partition 
     413      LOGICAL(KIND=C_BOOL) :: n_distributed_partition_tmp 
    394414      LOGICAL, OPTIONAL, INTENT(OUT) :: n_glo 
    395415      LOGICAL(KIND=C_BOOL) :: n_glo_tmp 
    … …  
    407427      CALL xios(is_defined_axisgroup_attr_hdl_)  & 
    408428      ( axisgroup_hdl, axis_ref, begin, bounds, data_begin, data_index, data_n, group_ref, long_name  & 
    409       , mask, n, n_glo, name, positive, standard_name, unit, value ) 
     429      , mask, n, n_distributed_partition, n_glo, name, positive, standard_name, unit, value ) 
    410430 
    411431  END SUBROUTINE xios(is_defined_axisgroup_attr_hdl) 
    … …  
    413433  SUBROUTINE xios(is_defined_axisgroup_attr_hdl_)   & 
    414434    ( axisgroup_hdl, axis_ref_, begin_, bounds_, data_begin_, data_index_, data_n_, group_ref_, long_name_  & 
    415     , mask_, n_, n_glo_, name_, positive_, standard_name_, unit_, value_ ) 
     435    , mask_, n_, n_distributed_partition_, n_glo_, name_, positive_, standard_name_, unit_, value_  & 
     436     ) 
    416437 
    417438    IMPLICIT NONE 
    … …  
    437458      LOGICAL, OPTIONAL, INTENT(OUT) :: n_ 
    438459      LOGICAL(KIND=C_BOOL) :: n__tmp 
     460      LOGICAL, OPTIONAL, INTENT(OUT) :: n_distributed_partition_ 
     461      LOGICAL(KIND=C_BOOL) :: n_distributed_partition__tmp 
    439462      LOGICAL, OPTIONAL, INTENT(OUT) :: n_glo_ 
    440463      LOGICAL(KIND=C_BOOL) :: n_glo__tmp 
    … …  
    500523      ENDIF 
    501524 
     525      IF (PRESENT(n_distributed_partition_)) THEN 
     526        n_distributed_partition__tmp = cxios_is_defined_axisgroup_n_distributed_partition(axisgroup_hdl%daddr) 
     527        n_distributed_partition_ = n_distributed_partition__tmp 
     528      ENDIF 
     529 
    502530      IF (PRESENT(n_glo_)) THEN 
    503531        n_glo__tmp = cxios_is_defined_axisgroup_n_glo(axisgroup_hdl%daddr) 

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

    r711 r779  
    1313  SUBROUTINE xios(set_file_attr)  & 
    1414    ( file_id, append, compression_level, description, enabled, format, min_digits, mode, name, name_suffix  & 
    15     , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter  & 
    16     , timeseries, ts_prefix, type ) 
     15    , output_freq, output_level, par_access, record_offset, split_freq, split_freq_format, sync_freq  & 
     16    , time_counter, timeseries, ts_prefix, type ) 
    1717 
    1818    IMPLICIT NONE 
    … …  
    3333      INTEGER  , OPTIONAL, INTENT(IN) :: output_level 
    3434      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: par_access 
     35      INTEGER  , OPTIONAL, INTENT(IN) :: record_offset 
    3536      TYPE(txios(duration))  , OPTIONAL, INTENT(IN) :: split_freq 
    3637      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: split_freq_format 
    … …  
    4445      CALL xios(set_file_attr_hdl_)   & 
    4546      ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
    46       , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
    47       , time_counter, timeseries, ts_prefix, type ) 
     47      , name_suffix, output_freq, output_level, par_access, record_offset, split_freq, split_freq_format  & 
     48      , sync_freq, time_counter, timeseries, ts_prefix, type ) 
    4849 
    4950  END SUBROUTINE xios(set_file_attr) 
    … …  
    5152  SUBROUTINE xios(set_file_attr_hdl)  & 
    5253    ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
    53     , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
    54     , time_counter, timeseries, ts_prefix, type ) 
     54    , name_suffix, output_freq, output_level, par_access, record_offset, split_freq, split_freq_format  & 
     55    , sync_freq, time_counter, timeseries, ts_prefix, type ) 
    5556 
    5657    IMPLICIT NONE 
    … …  
    7071      INTEGER  , OPTIONAL, INTENT(IN) :: output_level 
    7172      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: par_access 
     73      INTEGER  , OPTIONAL, INTENT(IN) :: record_offset 
    7274      TYPE(txios(duration))  , OPTIONAL, INTENT(IN) :: split_freq 
    7375      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: split_freq_format 
    … …  
    8082      CALL xios(set_file_attr_hdl_)  & 
    8183      ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
    82       , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
    83       , time_counter, timeseries, ts_prefix, type ) 
     84      , name_suffix, output_freq, output_level, par_access, record_offset, split_freq, split_freq_format  & 
     85      , sync_freq, time_counter, timeseries, ts_prefix, type ) 
    8486 
    8587  END SUBROUTINE xios(set_file_attr_hdl) 
    … …  
    8789  SUBROUTINE xios(set_file_attr_hdl_)   & 
    8890    ( file_hdl, append_, compression_level_, description_, enabled_, format_, min_digits_, mode_  & 
    89     , name_, name_suffix_, output_freq_, output_level_, par_access_, split_freq_, split_freq_format_  & 
    90     , sync_freq_, time_counter_, timeseries_, ts_prefix_, type_ ) 
     91    , name_, name_suffix_, output_freq_, output_level_, par_access_, record_offset_, split_freq_  & 
     92    , split_freq_format_, sync_freq_, time_counter_, timeseries_, ts_prefix_, type_ ) 
    9193 
    9294    IMPLICIT NONE 
    … …  
    106108      INTEGER  , OPTIONAL, INTENT(IN) :: output_level_ 
    107109      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: par_access_ 
     110      INTEGER  , OPTIONAL, INTENT(IN) :: record_offset_ 
    108111      TYPE(txios(duration))  , OPTIONAL, INTENT(IN) :: split_freq_ 
    109112      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: split_freq_format_ 
    … …  
    164167      ENDIF 
    165168 
     169      IF (PRESENT(record_offset_)) THEN 
     170        CALL cxios_set_file_record_offset(file_hdl%daddr, record_offset_) 
     171      ENDIF 
     172 
    166173      IF (PRESENT(split_freq_)) THEN 
    167174        CALL cxios_set_file_split_freq(file_hdl%daddr, split_freq_) 
    … …  
    196203  SUBROUTINE xios(get_file_attr)  & 
    197204    ( file_id, append, compression_level, description, enabled, format, min_digits, mode, name, name_suffix  & 
    198     , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter  & 
    199     , timeseries, ts_prefix, type ) 
     205    , output_freq, output_level, par_access, record_offset, split_freq, split_freq_format, sync_freq  & 
     206    , time_counter, timeseries, ts_prefix, type ) 
    200207 
    201208    IMPLICIT NONE 
    … …  
    216223      INTEGER  , OPTIONAL, INTENT(OUT) :: output_level 
    217224      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: par_access 
     225      INTEGER  , OPTIONAL, INTENT(OUT) :: record_offset 
    218226      TYPE(txios(duration))  , OPTIONAL, INTENT(OUT) :: split_freq 
    219227      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: split_freq_format 
    … …  
    227235      CALL xios(get_file_attr_hdl_)   & 
    228236      ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
    229       , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
    230       , time_counter, timeseries, ts_prefix, type ) 
     237      , name_suffix, output_freq, output_level, par_access, record_offset, split_freq, split_freq_format  & 
     238      , sync_freq, time_counter, timeseries, ts_prefix, type ) 
    231239 
    232240  END SUBROUTINE xios(get_file_attr) 
    … …  
    234242  SUBROUTINE xios(get_file_attr_hdl)  & 
    235243    ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
    236     , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
    237     , time_counter, timeseries, ts_prefix, type ) 
     244    , name_suffix, output_freq, output_level, par_access, record_offset, split_freq, split_freq_format  & 
     245    , sync_freq, time_counter, timeseries, ts_prefix, type ) 
    238246 
    239247    IMPLICIT NONE 
    … …  
    253261      INTEGER  , OPTIONAL, INTENT(OUT) :: output_level 
    254262      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: par_access 
     263      INTEGER  , OPTIONAL, INTENT(OUT) :: record_offset 
    255264      TYPE(txios(duration))  , OPTIONAL, INTENT(OUT) :: split_freq 
    256265      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: split_freq_format 
    … …  
    263272      CALL xios(get_file_attr_hdl_)  & 
    264273      ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
    265       , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
    266       , time_counter, timeseries, ts_prefix, type ) 
     274      , name_suffix, output_freq, output_level, par_access, record_offset, split_freq, split_freq_format  & 
     275      , sync_freq, time_counter, timeseries, ts_prefix, type ) 
    267276 
    268277  END SUBROUTINE xios(get_file_attr_hdl) 
    … …  
    270279  SUBROUTINE xios(get_file_attr_hdl_)   & 
    271280    ( file_hdl, append_, compression_level_, description_, enabled_, format_, min_digits_, mode_  & 
    272     , name_, name_suffix_, output_freq_, output_level_, par_access_, split_freq_, split_freq_format_  & 
    273     , sync_freq_, time_counter_, timeseries_, ts_prefix_, type_ ) 
     281    , name_, name_suffix_, output_freq_, output_level_, par_access_, record_offset_, split_freq_  & 
     282    , split_freq_format_, sync_freq_, time_counter_, timeseries_, ts_prefix_, type_ ) 
    274283 
    275284    IMPLICIT NONE 
    … …  
    289298      INTEGER  , OPTIONAL, INTENT(OUT) :: output_level_ 
    290299      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: par_access_ 
     300      INTEGER  , OPTIONAL, INTENT(OUT) :: record_offset_ 
    291301      TYPE(txios(duration))  , OPTIONAL, INTENT(OUT) :: split_freq_ 
    292302      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: split_freq_format_ 
    … …  
    347357      ENDIF 
    348358 
     359      IF (PRESENT(record_offset_)) THEN 
     360        CALL cxios_get_file_record_offset(file_hdl%daddr, record_offset_) 
     361      ENDIF 
     362 
    349363      IF (PRESENT(split_freq_)) THEN 
    350364        CALL cxios_get_file_split_freq(file_hdl%daddr, split_freq_) 
    … …  
    379393  SUBROUTINE xios(is_defined_file_attr)  & 
    380394    ( file_id, append, compression_level, description, enabled, format, min_digits, mode, name, name_suffix  & 
    381     , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter  & 
    382     , timeseries, ts_prefix, type ) 
     395    , output_freq, output_level, par_access, record_offset, split_freq, split_freq_format, sync_freq  & 
     396    , time_counter, timeseries, ts_prefix, type ) 
    383397 
    384398    IMPLICIT NONE 
    … …  
    409423      LOGICAL, OPTIONAL, INTENT(OUT) :: par_access 
    410424      LOGICAL(KIND=C_BOOL) :: par_access_tmp 
     425      LOGICAL, OPTIONAL, INTENT(OUT) :: record_offset 
     426      LOGICAL(KIND=C_BOOL) :: record_offset_tmp 
    411427      LOGICAL, OPTIONAL, INTENT(OUT) :: split_freq 
    412428      LOGICAL(KIND=C_BOOL) :: split_freq_tmp 
    … …  
    427443      CALL xios(is_defined_file_attr_hdl_)   & 
    428444      ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
    429       , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
    430       , time_counter, timeseries, ts_prefix, type ) 
     445      , name_suffix, output_freq, output_level, par_access, record_offset, split_freq, split_freq_format  & 
     446      , sync_freq, time_counter, timeseries, ts_prefix, type ) 
    431447 
    432448  END SUBROUTINE xios(is_defined_file_attr) 
    … …  
    434450  SUBROUTINE xios(is_defined_file_attr_hdl)  & 
    435451    ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
    436     , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
    437     , time_counter, timeseries, ts_prefix, type ) 
     452    , name_suffix, output_freq, output_level, par_access, record_offset, split_freq, split_freq_format  & 
     453    , sync_freq, time_counter, timeseries, ts_prefix, type ) 
    438454 
    439455    IMPLICIT NONE 
    … …  
    463479      LOGICAL, OPTIONAL, INTENT(OUT) :: par_access 
    464480      LOGICAL(KIND=C_BOOL) :: par_access_tmp 
     481      LOGICAL, OPTIONAL, INTENT(OUT) :: record_offset 
     482      LOGICAL(KIND=C_BOOL) :: record_offset_tmp 
    465483      LOGICAL, OPTIONAL, INTENT(OUT) :: split_freq 
    466484      LOGICAL(KIND=C_BOOL) :: split_freq_tmp 
    … …  
    480498      CALL xios(is_defined_file_attr_hdl_)  & 
    481499      ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
    482       , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
    483       , time_counter, timeseries, ts_prefix, type ) 
     500      , name_suffix, output_freq, output_level, par_access, record_offset, split_freq, split_freq_format  & 
     501      , sync_freq, time_counter, timeseries, ts_prefix, type ) 
    484502 
    485503  END SUBROUTINE xios(is_defined_file_attr_hdl) 
    … …  
    487505  SUBROUTINE xios(is_defined_file_attr_hdl_)   & 
    488506    ( file_hdl, append_, compression_level_, description_, enabled_, format_, min_digits_, mode_  & 
    489     , name_, name_suffix_, output_freq_, output_level_, par_access_, split_freq_, split_freq_format_  & 
    490     , sync_freq_, time_counter_, timeseries_, ts_prefix_, type_ ) 
     507    , name_, name_suffix_, output_freq_, output_level_, par_access_, record_offset_, split_freq_  & 
     508    , split_freq_format_, sync_freq_, time_counter_, timeseries_, ts_prefix_, type_ ) 
    491509 
    492510    IMPLICIT NONE 
    … …  
    516534      LOGICAL, OPTIONAL, INTENT(OUT) :: par_access_ 
    517535      LOGICAL(KIND=C_BOOL) :: par_access__tmp 
     536      LOGICAL, OPTIONAL, INTENT(OUT) :: record_offset_ 
     537      LOGICAL(KIND=C_BOOL) :: record_offset__tmp 
    518538      LOGICAL, OPTIONAL, INTENT(OUT) :: split_freq_ 
    519539      LOGICAL(KIND=C_BOOL) :: split_freq__tmp 
    … …  
    591611      ENDIF 
    592612 
     613      IF (PRESENT(record_offset_)) THEN 
     614        record_offset__tmp = cxios_is_defined_file_record_offset(file_hdl%daddr) 
     615        record_offset_ = record_offset__tmp 
     616      ENDIF 
     617 
    593618      IF (PRESENT(split_freq_)) THEN 
    594619        split_freq__tmp = cxios_is_defined_file_split_freq(file_hdl%daddr) 

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

    r711 r779  
    1313  SUBROUTINE xios(set_filegroup_attr)  & 
    1414    ( filegroup_id, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    15     , mode, name, name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format  & 
    16     , sync_freq, time_counter, timeseries, ts_prefix, type ) 
     15    , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
     16    , split_freq_format, sync_freq, time_counter, timeseries, ts_prefix, type ) 
    1717 
    1818    IMPLICIT NONE 
    … …  
    3434      INTEGER  , OPTIONAL, INTENT(IN) :: output_level 
    3535      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: par_access 
     36      INTEGER  , OPTIONAL, INTENT(IN) :: record_offset 
    3637      TYPE(txios(duration))  , OPTIONAL, INTENT(IN) :: split_freq 
    3738      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: split_freq_format 
    … …  
    4546      CALL xios(set_filegroup_attr_hdl_)   & 
    4647      ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    47       , mode, name, name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format  & 
    48       , sync_freq, time_counter, timeseries, ts_prefix, type ) 
     48      , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
     49      , split_freq_format, sync_freq, time_counter, timeseries, ts_prefix, type ) 
    4950 
    5051  END SUBROUTINE xios(set_filegroup_attr) 
    … …  
    5253  SUBROUTINE xios(set_filegroup_attr_hdl)  & 
    5354    ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    54     , mode, name, name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format  & 
    55     , sync_freq, time_counter, timeseries, ts_prefix, type ) 
     55    , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
     56    , split_freq_format, sync_freq, time_counter, timeseries, ts_prefix, type ) 
    5657 
    5758    IMPLICIT NONE 
    … …  
    7273      INTEGER  , OPTIONAL, INTENT(IN) :: output_level 
    7374      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: par_access 
     75      INTEGER  , OPTIONAL, INTENT(IN) :: record_offset 
    7476      TYPE(txios(duration))  , OPTIONAL, INTENT(IN) :: split_freq 
    7577      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: split_freq_format 
    … …  
    8284      CALL xios(set_filegroup_attr_hdl_)  & 
    8385      ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    84       , mode, name, name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format  & 
    85       , sync_freq, time_counter, timeseries, ts_prefix, type ) 
     86      , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
     87      , split_freq_format, sync_freq, time_counter, timeseries, ts_prefix, type ) 
    8688 
    8789  END SUBROUTINE xios(set_filegroup_attr_hdl) 
    … …  
    8991  SUBROUTINE xios(set_filegroup_attr_hdl_)   & 
    9092    ( filegroup_hdl, append_, compression_level_, description_, enabled_, format_, group_ref_, min_digits_  & 
    91     , mode_, name_, name_suffix_, output_freq_, output_level_, par_access_, split_freq_, split_freq_format_  & 
    92     , sync_freq_, time_counter_, timeseries_, ts_prefix_, type_ ) 
     93    , mode_, name_, name_suffix_, output_freq_, output_level_, par_access_, record_offset_, split_freq_  & 
     94    , split_freq_format_, sync_freq_, time_counter_, timeseries_, ts_prefix_, type_ ) 
    9395 
    9496    IMPLICIT NONE 
    … …  
    109111      INTEGER  , OPTIONAL, INTENT(IN) :: output_level_ 
    110112      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: par_access_ 
     113      INTEGER  , OPTIONAL, INTENT(IN) :: record_offset_ 
    111114      TYPE(txios(duration))  , OPTIONAL, INTENT(IN) :: split_freq_ 
    112115      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: split_freq_format_ 
    … …  
    171174      ENDIF 
    172175 
     176      IF (PRESENT(record_offset_)) THEN 
     177        CALL cxios_set_filegroup_record_offset(filegroup_hdl%daddr, record_offset_) 
     178      ENDIF 
     179 
    173180      IF (PRESENT(split_freq_)) THEN 
    174181        CALL cxios_set_filegroup_split_freq(filegroup_hdl%daddr, split_freq_) 
    … …  
    203210  SUBROUTINE xios(get_filegroup_attr)  & 
    204211    ( filegroup_id, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    205     , mode, name, name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format  & 
    206     , sync_freq, time_counter, timeseries, ts_prefix, type ) 
     212    , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
     213    , split_freq_format, sync_freq, time_counter, timeseries, ts_prefix, type ) 
    207214 
    208215    IMPLICIT NONE 
    … …  
    224231      INTEGER  , OPTIONAL, INTENT(OUT) :: output_level 
    225232      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: par_access 
     233      INTEGER  , OPTIONAL, INTENT(OUT) :: record_offset 
    226234      TYPE(txios(duration))  , OPTIONAL, INTENT(OUT) :: split_freq 
    227235      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: split_freq_format 
    … …  
    235243      CALL xios(get_filegroup_attr_hdl_)   & 
    236244      ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    237       , mode, name, name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format  & 
    238       , sync_freq, time_counter, timeseries, ts_prefix, type ) 
     245      , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
     246      , split_freq_format, sync_freq, time_counter, timeseries, ts_prefix, type ) 
    239247 
    240248  END SUBROUTINE xios(get_filegroup_attr) 
    … …  
    242250  SUBROUTINE xios(get_filegroup_attr_hdl)  & 
    243251    ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    244     , mode, name, name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format  & 
    245     , sync_freq, time_counter, timeseries, ts_prefix, type ) 
     252    , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
     253    , split_freq_format, sync_freq, time_counter, timeseries, ts_prefix, type ) 
    246254 
    247255    IMPLICIT NONE 
    … …  
    262270      INTEGER  , OPTIONAL, INTENT(OUT) :: output_level 
    263271      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: par_access 
     272      INTEGER  , OPTIONAL, INTENT(OUT) :: record_offset 
    264273      TYPE(txios(duration))  , OPTIONAL, INTENT(OUT) :: split_freq 
    265274      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: split_freq_format 
    … …  
    272281      CALL xios(get_filegroup_attr_hdl_)  & 
    273282      ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    274       , mode, name, name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format  & 
    275       , sync_freq, time_counter, timeseries, ts_prefix, type ) 
     283      , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
     284      , split_freq_format, sync_freq, time_counter, timeseries, ts_prefix, type ) 
    276285 
    277286  END SUBROUTINE xios(get_filegroup_attr_hdl) 
    … …  
    279288  SUBROUTINE xios(get_filegroup_attr_hdl_)   & 
    280289    ( filegroup_hdl, append_, compression_level_, description_, enabled_, format_, group_ref_, min_digits_  & 
    281     , mode_, name_, name_suffix_, output_freq_, output_level_, par_access_, split_freq_, split_freq_format_  & 
    282     , sync_freq_, time_counter_, timeseries_, ts_prefix_, type_ ) 
     290    , mode_, name_, name_suffix_, output_freq_, output_level_, par_access_, record_offset_, split_freq_  & 
     291    , split_freq_format_, sync_freq_, time_counter_, timeseries_, ts_prefix_, type_ ) 
    283292 
    284293    IMPLICIT NONE 
    … …  
    299308      INTEGER  , OPTIONAL, INTENT(OUT) :: output_level_ 
    300309      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: par_access_ 
     310      INTEGER  , OPTIONAL, INTENT(OUT) :: record_offset_ 
    301311      TYPE(txios(duration))  , OPTIONAL, INTENT(OUT) :: split_freq_ 
    302312      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: split_freq_format_ 
    … …  
    361371      ENDIF 
    362372 
     373      IF (PRESENT(record_offset_)) THEN 
     374        CALL cxios_get_filegroup_record_offset(filegroup_hdl%daddr, record_offset_) 
     375      ENDIF 
     376 
    363377      IF (PRESENT(split_freq_)) THEN 
    364378        CALL cxios_get_filegroup_split_freq(filegroup_hdl%daddr, split_freq_) 
    … …  
    393407  SUBROUTINE xios(is_defined_filegroup_attr)  & 
    394408    ( filegroup_id, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    395     , mode, name, name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format  & 
    396     , sync_freq, time_counter, timeseries, ts_prefix, type ) 
     409    , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
     410    , split_freq_format, sync_freq, time_counter, timeseries, ts_prefix, type ) 
    397411 
    398412    IMPLICIT NONE 
    … …  
    425439      LOGICAL, OPTIONAL, INTENT(OUT) :: par_access 
    426440      LOGICAL(KIND=C_BOOL) :: par_access_tmp 
     441      LOGICAL, OPTIONAL, INTENT(OUT) :: record_offset 
     442      LOGICAL(KIND=C_BOOL) :: record_offset_tmp 
    427443      LOGICAL, OPTIONAL, INTENT(OUT) :: split_freq 
    428444      LOGICAL(KIND=C_BOOL) :: split_freq_tmp 
    … …  
    443459      CALL xios(is_defined_filegroup_attr_hdl_)   & 
    444460      ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    445       , mode, name, name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format  & 
    446       , sync_freq, time_counter, timeseries, ts_prefix, type ) 
     461      , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
     462      , split_freq_format, sync_freq, time_counter, timeseries, ts_prefix, type ) 
    447463 
    448464  END SUBROUTINE xios(is_defined_filegroup_attr) 
    … …  
    450466  SUBROUTINE xios(is_defined_filegroup_attr_hdl)  & 
    451467    ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    452     , mode, name, name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format  & 
    453     , sync_freq, time_counter, timeseries, ts_prefix, type ) 
     468    , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
     469    , split_freq_format, sync_freq, time_counter, timeseries, ts_prefix, type ) 
    454470 
    455471    IMPLICIT NONE 
    … …  
    481497      LOGICAL, OPTIONAL, INTENT(OUT) :: par_access 
    482498      LOGICAL(KIND=C_BOOL) :: par_access_tmp 
     499      LOGICAL, OPTIONAL, INTENT(OUT) :: record_offset 
     500      LOGICAL(KIND=C_BOOL) :: record_offset_tmp 
    483501      LOGICAL, OPTIONAL, INTENT(OUT) :: split_freq 
    484502      LOGICAL(KIND=C_BOOL) :: split_freq_tmp 
    … …  
    498516      CALL xios(is_defined_filegroup_attr_hdl_)  & 
    499517      ( filegroup_hdl, append, compression_level, description, enabled, format, group_ref, min_digits  & 
    500       , mode, name, name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format  & 
    501       , sync_freq, time_counter, timeseries, ts_prefix, type ) 
     518      , mode, name, name_suffix, output_freq, output_level, par_access, record_offset, split_freq  & 
     519      , split_freq_format, sync_freq, time_counter, timeseries, ts_prefix, type ) 
    502520 
    503521  END SUBROUTINE xios(is_defined_filegroup_attr_hdl) 
    … …  
    505523  SUBROUTINE xios(is_defined_filegroup_attr_hdl_)   & 
    506524    ( filegroup_hdl, append_, compression_level_, description_, enabled_, format_, group_ref_, min_digits_  & 
    507     , mode_, name_, name_suffix_, output_freq_, output_level_, par_access_, split_freq_, split_freq_format_  & 
    508     , sync_freq_, time_counter_, timeseries_, ts_prefix_, type_ ) 
     525    , mode_, name_, name_suffix_, output_freq_, output_level_, par_access_, record_offset_, split_freq_  & 
     526    , split_freq_format_, sync_freq_, time_counter_, timeseries_, ts_prefix_, type_ ) 
    509527 
    510528    IMPLICIT NONE 
    … …  
    536554      LOGICAL, OPTIONAL, INTENT(OUT) :: par_access_ 
    537555      LOGICAL(KIND=C_BOOL) :: par_access__tmp 
     556      LOGICAL, OPTIONAL, INTENT(OUT) :: record_offset_ 
     557      LOGICAL(KIND=C_BOOL) :: record_offset__tmp 
    538558      LOGICAL, OPTIONAL, INTENT(OUT) :: split_freq_ 
    539559      LOGICAL(KIND=C_BOOL) :: split_freq__tmp 
    … …  
    616636      ENDIF 
    617637 
     638      IF (PRESENT(record_offset_)) THEN 
     639        record_offset__tmp = cxios_is_defined_filegroup_record_offset(filegroup_hdl%daddr) 
     640        record_offset_ = record_offset__tmp 
     641      ENDIF 
     642 
    618643      IF (PRESENT(split_freq_)) THEN 
    619644        split_freq__tmp = cxios_is_defined_filegroup_split_freq(filegroup_hdl%daddr) 
Note: See TracChangeset for help on using the changeset viewer.