Changeset 789


Ignore:
Timestamp:
11/16/15 16:21:45 (5 years ago)
Author:
rlacroix
Message:

Domain: Remove the domain_src attribute.

It was added but was never used.

Location:
XIOS/trunk/src
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/src/config/domain_attribute.conf

    r781 r789  
    5353DECLARE_ENUM3(type,rectilinear,curvilinear,unstructured) 
    5454DECLARE_ATTRIBUTE(StdString, domain_ref) 
    55 DECLARE_ATTRIBUTE(StdString, domain_src) 
  • XIOS/trunk/src/interface/c_attr/icdomain_attr.cpp

    r781 r789  
    334334 
    335335 
    336   void cxios_set_domain_domain_src(domain_Ptr domain_hdl, const char * domain_src, int domain_src_size) 
    337   { 
    338     std::string domain_src_str; 
    339     if (!cstr2string(domain_src, domain_src_size, domain_src_str)) return; 
    340     CTimer::get("XIOS").resume(); 
    341     domain_hdl->domain_src.setValue(domain_src_str); 
    342     CTimer::get("XIOS").suspend(); 
    343   } 
    344  
    345   void cxios_get_domain_domain_src(domain_Ptr domain_hdl, char * domain_src, int domain_src_size) 
    346   { 
    347     CTimer::get("XIOS").resume(); 
    348     if (!string_copy(domain_hdl->domain_src.getInheritedValue(), domain_src, domain_src_size)) 
    349       ERROR("void cxios_get_domain_domain_src(domain_Ptr domain_hdl, char * domain_src, int domain_src_size)", << "Input string is too short"); 
    350     CTimer::get("XIOS").suspend(); 
    351   } 
    352  
    353   bool cxios_is_defined_domain_domain_src(domain_Ptr domain_hdl) 
    354   { 
    355      CTimer::get("XIOS").resume(); 
    356      bool isDefined = domain_hdl->domain_src.hasInheritedValue(); 
    357      CTimer::get("XIOS").suspend(); 
    358      return isDefined; 
    359   } 
    360  
    361  
    362336  void cxios_set_domain_i_index(domain_Ptr domain_hdl, int* i_index, int* extent) 
    363337  { 
  • XIOS/trunk/src/interface/c_attr/icdomaingroup_attr.cpp

    r781 r789  
    334334 
    335335 
    336   void cxios_set_domaingroup_domain_src(domaingroup_Ptr domaingroup_hdl, const char * domain_src, int domain_src_size) 
    337   { 
    338     std::string domain_src_str; 
    339     if (!cstr2string(domain_src, domain_src_size, domain_src_str)) return; 
    340     CTimer::get("XIOS").resume(); 
    341     domaingroup_hdl->domain_src.setValue(domain_src_str); 
    342     CTimer::get("XIOS").suspend(); 
    343   } 
    344  
    345   void cxios_get_domaingroup_domain_src(domaingroup_Ptr domaingroup_hdl, char * domain_src, int domain_src_size) 
    346   { 
    347     CTimer::get("XIOS").resume(); 
    348     if (!string_copy(domaingroup_hdl->domain_src.getInheritedValue(), domain_src, domain_src_size)) 
    349       ERROR("void cxios_get_domaingroup_domain_src(domaingroup_Ptr domaingroup_hdl, char * domain_src, int domain_src_size)", << "Input string is too short"); 
    350     CTimer::get("XIOS").suspend(); 
    351   } 
    352  
    353   bool cxios_is_defined_domaingroup_domain_src(domaingroup_Ptr domaingroup_hdl) 
    354   { 
    355      CTimer::get("XIOS").resume(); 
    356      bool isDefined = domaingroup_hdl->domain_src.hasInheritedValue(); 
    357      CTimer::get("XIOS").suspend(); 
    358      return isDefined; 
    359   } 
    360  
    361  
    362336  void cxios_set_domaingroup_group_ref(domaingroup_Ptr domaingroup_hdl, const char * group_ref, int group_ref_size) 
    363337  { 
  • XIOS/trunk/src/interface/fortran_attr/domain_interface_attr.F90

    r781 r789  
    273273 
    274274 
    275     SUBROUTINE cxios_set_domain_domain_src(domain_hdl, domain_src, domain_src_size) BIND(C) 
    276       USE ISO_C_BINDING 
    277       INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 
    278       CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: domain_src 
    279       INTEGER  (kind = C_INT)     , VALUE        :: domain_src_size 
    280     END SUBROUTINE cxios_set_domain_domain_src 
    281  
    282     SUBROUTINE cxios_get_domain_domain_src(domain_hdl, domain_src, domain_src_size) BIND(C) 
    283       USE ISO_C_BINDING 
    284       INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 
    285       CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: domain_src 
    286       INTEGER  (kind = C_INT)     , VALUE        :: domain_src_size 
    287     END SUBROUTINE cxios_get_domain_domain_src 
    288  
    289     FUNCTION cxios_is_defined_domain_domain_src(domain_hdl) BIND(C) 
    290       USE ISO_C_BINDING 
    291       LOGICAL(kind=C_BOOL) :: cxios_is_defined_domain_domain_src 
    292       INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 
    293     END FUNCTION cxios_is_defined_domain_domain_src 
    294  
    295  
    296275    SUBROUTINE cxios_set_domain_i_index(domain_hdl, i_index, extent) BIND(C) 
    297276      USE ISO_C_BINDING 
  • XIOS/trunk/src/interface/fortran_attr/domaingroup_interface_attr.F90

    r781 r789  
    273273 
    274274 
    275     SUBROUTINE cxios_set_domaingroup_domain_src(domaingroup_hdl, domain_src, domain_src_size) BIND(C) 
    276       USE ISO_C_BINDING 
    277       INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 
    278       CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: domain_src 
    279       INTEGER  (kind = C_INT)     , VALUE        :: domain_src_size 
    280     END SUBROUTINE cxios_set_domaingroup_domain_src 
    281  
    282     SUBROUTINE cxios_get_domaingroup_domain_src(domaingroup_hdl, domain_src, domain_src_size) BIND(C) 
    283       USE ISO_C_BINDING 
    284       INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 
    285       CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: domain_src 
    286       INTEGER  (kind = C_INT)     , VALUE        :: domain_src_size 
    287     END SUBROUTINE cxios_get_domaingroup_domain_src 
    288  
    289     FUNCTION cxios_is_defined_domaingroup_domain_src(domaingroup_hdl) BIND(C) 
    290       USE ISO_C_BINDING 
    291       LOGICAL(kind=C_BOOL) :: cxios_is_defined_domaingroup_domain_src 
    292       INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 
    293     END FUNCTION cxios_is_defined_domaingroup_domain_src 
    294  
    295  
    296275    SUBROUTINE cxios_set_domaingroup_group_ref(domaingroup_hdl, group_ref, group_ref_size) BIND(C) 
    297276      USE ISO_C_BINDING 
  • XIOS/trunk/src/interface/fortran_attr/idomain_attr.F90

    r781 r789  
    1313  SUBROUTINE xios(set_domain_attr)  & 
    1414    ( domain_id, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim, data_i_index  & 
    15     , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, domain_src, i_index  & 
    16     , ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d  & 
    17     , mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     15    , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, i_index, ibegin, j_index  & 
     16    , jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name  & 
     17    , ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
    1818 
    1919    IMPLICIT NONE 
     
    3333      INTEGER  , OPTIONAL, INTENT(IN) :: data_nj 
    3434      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_ref 
    35       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_src 
    3635      INTEGER  , OPTIONAL, INTENT(IN) :: i_index(:) 
    3736      INTEGER  , OPTIONAL, INTENT(IN) :: ibegin 
     
    5958      CALL xios(set_domain_attr_hdl_)   & 
    6059      ( domain_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim, data_i_index  & 
    61       , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, domain_src, i_index  & 
    62       , ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d  & 
    63       , mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     60      , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, i_index, ibegin, j_index  & 
     61      , jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name  & 
     62      , ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
    6463 
    6564  END SUBROUTINE xios(set_domain_attr) 
     
    6766  SUBROUTINE xios(set_domain_attr_hdl)  & 
    6867    ( domain_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim, data_i_index  & 
    69     , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, domain_src, i_index  & 
    70     , ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d  & 
    71     , mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     68    , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, i_index, ibegin, j_index  & 
     69    , jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name  & 
     70    , ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
    7271 
    7372    IMPLICIT NONE 
     
    8685      INTEGER  , OPTIONAL, INTENT(IN) :: data_nj 
    8786      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_ref 
    88       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_src 
    8987      INTEGER  , OPTIONAL, INTENT(IN) :: i_index(:) 
    9088      INTEGER  , OPTIONAL, INTENT(IN) :: ibegin 
     
    111109      CALL xios(set_domain_attr_hdl_)  & 
    112110      ( domain_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim, data_i_index  & 
    113       , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, domain_src, i_index  & 
    114       , ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d  & 
    115       , mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     111      , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, i_index, ibegin, j_index  & 
     112      , jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name  & 
     113      , ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
    116114 
    117115  END SUBROUTINE xios(set_domain_attr_hdl) 
     
    120118    ( domain_hdl, area_, bounds_lat_1d_, bounds_lat_2d_, bounds_lon_1d_, bounds_lon_2d_, data_dim_  & 
    121119    , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_ni_, data_nj_, domain_ref_  & 
    122     , domain_src_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_, long_name_  & 
    123     , lonvalue_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_  & 
    124     , standard_name_, type_ ) 
     120    , i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_, long_name_, lonvalue_1d_  & 
     121    , lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, standard_name_  & 
     122    , type_ ) 
    125123 
    126124    IMPLICIT NONE 
     
    139137      INTEGER  , OPTIONAL, INTENT(IN) :: data_nj_ 
    140138      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_ref_ 
    141       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_src_ 
    142139      INTEGER  , OPTIONAL, INTENT(IN) :: i_index_(:) 
    143140      INTEGER  , OPTIONAL, INTENT(IN) :: ibegin_ 
     
    214211      ENDIF 
    215212 
    216       IF (PRESENT(domain_src_)) THEN 
    217         CALL cxios_set_domain_domain_src(domain_hdl%daddr, domain_src_, len(domain_src_)) 
    218       ENDIF 
    219  
    220213      IF (PRESENT(i_index_)) THEN 
    221214        CALL cxios_set_domain_i_index(domain_hdl%daddr, i_index_, SHAPE(i_index_)) 
     
    302295  SUBROUTINE xios(get_domain_attr)  & 
    303296    ( domain_id, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim, data_i_index  & 
    304     , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, domain_src, i_index  & 
    305     , ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d  & 
    306     , mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     297    , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, i_index, ibegin, j_index  & 
     298    , jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name  & 
     299    , ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
    307300 
    308301    IMPLICIT NONE 
     
    322315      INTEGER  , OPTIONAL, INTENT(OUT) :: data_nj 
    323316      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_ref 
    324       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_src 
    325317      INTEGER  , OPTIONAL, INTENT(OUT) :: i_index(:) 
    326318      INTEGER  , OPTIONAL, INTENT(OUT) :: ibegin 
     
    348340      CALL xios(get_domain_attr_hdl_)   & 
    349341      ( domain_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim, data_i_index  & 
    350       , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, domain_src, i_index  & 
    351       , ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d  & 
    352       , mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     342      , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, i_index, ibegin, j_index  & 
     343      , jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name  & 
     344      , ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
    353345 
    354346  END SUBROUTINE xios(get_domain_attr) 
     
    356348  SUBROUTINE xios(get_domain_attr_hdl)  & 
    357349    ( domain_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim, data_i_index  & 
    358     , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, domain_src, i_index  & 
    359     , ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d  & 
    360     , mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     350    , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, i_index, ibegin, j_index  & 
     351    , jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name  & 
     352    , ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
    361353 
    362354    IMPLICIT NONE 
     
    375367      INTEGER  , OPTIONAL, INTENT(OUT) :: data_nj 
    376368      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_ref 
    377       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_src 
    378369      INTEGER  , OPTIONAL, INTENT(OUT) :: i_index(:) 
    379370      INTEGER  , OPTIONAL, INTENT(OUT) :: ibegin 
     
    400391      CALL xios(get_domain_attr_hdl_)  & 
    401392      ( domain_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim, data_i_index  & 
    402       , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, domain_src, i_index  & 
    403       , ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d  & 
    404       , mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     393      , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, i_index, ibegin, j_index  & 
     394      , jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name  & 
     395      , ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
    405396 
    406397  END SUBROUTINE xios(get_domain_attr_hdl) 
     
    409400    ( domain_hdl, area_, bounds_lat_1d_, bounds_lat_2d_, bounds_lon_1d_, bounds_lon_2d_, data_dim_  & 
    410401    , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_ni_, data_nj_, domain_ref_  & 
    411     , domain_src_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_, long_name_  & 
    412     , lonvalue_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_  & 
    413     , standard_name_, type_ ) 
     402    , i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_, long_name_, lonvalue_1d_  & 
     403    , lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, standard_name_  & 
     404    , type_ ) 
    414405 
    415406    IMPLICIT NONE 
     
    428419      INTEGER  , OPTIONAL, INTENT(OUT) :: data_nj_ 
    429420      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_ref_ 
    430       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_src_ 
    431421      INTEGER  , OPTIONAL, INTENT(OUT) :: i_index_(:) 
    432422      INTEGER  , OPTIONAL, INTENT(OUT) :: ibegin_ 
     
    503493      ENDIF 
    504494 
    505       IF (PRESENT(domain_src_)) THEN 
    506         CALL cxios_get_domain_domain_src(domain_hdl%daddr, domain_src_, len(domain_src_)) 
    507       ENDIF 
    508  
    509495      IF (PRESENT(i_index_)) THEN 
    510496        CALL cxios_get_domain_i_index(domain_hdl%daddr, i_index_, SHAPE(i_index_)) 
     
    591577  SUBROUTINE xios(is_defined_domain_attr)  & 
    592578    ( domain_id, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim, data_i_index  & 
    593     , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, domain_src, i_index  & 
    594     , ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d  & 
    595     , mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     579    , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, i_index, ibegin, j_index  & 
     580    , jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name  & 
     581    , ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
    596582 
    597583    IMPLICIT NONE 
     
    624610      LOGICAL, OPTIONAL, INTENT(OUT) :: domain_ref 
    625611      LOGICAL(KIND=C_BOOL) :: domain_ref_tmp 
    626       LOGICAL, OPTIONAL, INTENT(OUT) :: domain_src 
    627       LOGICAL(KIND=C_BOOL) :: domain_src_tmp 
    628612      LOGICAL, OPTIONAL, INTENT(OUT) :: i_index 
    629613      LOGICAL(KIND=C_BOOL) :: i_index_tmp 
     
    668652      CALL xios(is_defined_domain_attr_hdl_)   & 
    669653      ( domain_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim, data_i_index  & 
    670       , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, domain_src, i_index  & 
    671       , ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d  & 
    672       , mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     654      , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, i_index, ibegin, j_index  & 
     655      , jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name  & 
     656      , ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
    673657 
    674658  END SUBROUTINE xios(is_defined_domain_attr) 
     
    676660  SUBROUTINE xios(is_defined_domain_attr_hdl)  & 
    677661    ( domain_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim, data_i_index  & 
    678     , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, domain_src, i_index  & 
    679     , ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d  & 
    680     , mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     662    , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, i_index, ibegin, j_index  & 
     663    , jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name  & 
     664    , ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
    681665 
    682666    IMPLICIT NONE 
     
    708692      LOGICAL, OPTIONAL, INTENT(OUT) :: domain_ref 
    709693      LOGICAL(KIND=C_BOOL) :: domain_ref_tmp 
    710       LOGICAL, OPTIONAL, INTENT(OUT) :: domain_src 
    711       LOGICAL(KIND=C_BOOL) :: domain_src_tmp 
    712694      LOGICAL, OPTIONAL, INTENT(OUT) :: i_index 
    713695      LOGICAL(KIND=C_BOOL) :: i_index_tmp 
     
    751733      CALL xios(is_defined_domain_attr_hdl_)  & 
    752734      ( domain_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim, data_i_index  & 
    753       , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, domain_src, i_index  & 
    754       , ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d  & 
    755       , mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
     735      , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, i_index, ibegin, j_index  & 
     736      , jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name  & 
     737      , ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
    756738 
    757739  END SUBROUTINE xios(is_defined_domain_attr_hdl) 
     
    760742    ( domain_hdl, area_, bounds_lat_1d_, bounds_lat_2d_, bounds_lon_1d_, bounds_lon_2d_, data_dim_  & 
    761743    , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_ni_, data_nj_, domain_ref_  & 
    762     , domain_src_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_, long_name_  & 
    763     , lonvalue_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_  & 
    764     , standard_name_, type_ ) 
     744    , i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_, long_name_, lonvalue_1d_  & 
     745    , lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, standard_name_  & 
     746    , type_ ) 
    765747 
    766748    IMPLICIT NONE 
     
    792774      LOGICAL, OPTIONAL, INTENT(OUT) :: domain_ref_ 
    793775      LOGICAL(KIND=C_BOOL) :: domain_ref__tmp 
    794       LOGICAL, OPTIONAL, INTENT(OUT) :: domain_src_ 
    795       LOGICAL(KIND=C_BOOL) :: domain_src__tmp 
    796776      LOGICAL, OPTIONAL, INTENT(OUT) :: i_index_ 
    797777      LOGICAL(KIND=C_BOOL) :: i_index__tmp 
     
    898878      ENDIF 
    899879 
    900       IF (PRESENT(domain_src_)) THEN 
    901         domain_src__tmp = cxios_is_defined_domain_domain_src(domain_hdl%daddr) 
    902         domain_src_ = domain_src__tmp 
    903       ENDIF 
    904  
    905880      IF (PRESENT(i_index_)) THEN 
    906881        i_index__tmp = cxios_is_defined_domain_i_index(domain_hdl%daddr) 
  • XIOS/trunk/src/interface/fortran_attr/idomaingroup_attr.F90

    r781 r789  
    1313  SUBROUTINE xios(set_domaingroup_attr)  & 
    1414    ( domaingroup_id, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  & 
    15     , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, domain_src  & 
    16     , group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d  & 
    17     , lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type  & 
    18      ) 
     15    , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, group_ref  & 
     16    , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  & 
     17    , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
    1918 
    2019    IMPLICIT NONE 
     
    3433      INTEGER  , OPTIONAL, INTENT(IN) :: data_nj 
    3534      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_ref 
    36       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_src 
    3735      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref 
    3836      INTEGER  , OPTIONAL, INTENT(IN) :: i_index(:) 
     
    6159      CALL xios(set_domaingroup_attr_hdl_)   & 
    6260      ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  & 
    63       , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, domain_src  & 
    64       , group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d  & 
    65       , lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type  & 
    66        ) 
     61      , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, group_ref  & 
     62      , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  & 
     63      , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
    6764 
    6865  END SUBROUTINE xios(set_domaingroup_attr) 
     
    7067  SUBROUTINE xios(set_domaingroup_attr_hdl)  & 
    7168    ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  & 
    72     , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, domain_src  & 
    73     , group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d  & 
    74     , lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type  & 
    75      ) 
     69    , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, group_ref  & 
     70    , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  & 
     71    , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
    7672 
    7773    IMPLICIT NONE 
     
    9086      INTEGER  , OPTIONAL, INTENT(IN) :: data_nj 
    9187      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_ref 
    92       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_src 
    9388      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref 
    9489      INTEGER  , OPTIONAL, INTENT(IN) :: i_index(:) 
     
    116111      CALL xios(set_domaingroup_attr_hdl_)  & 
    117112      ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  & 
    118       , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, domain_src  & 
    119       , group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d  & 
    120       , lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type  & 
    121        ) 
     113      , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, group_ref  & 
     114      , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  & 
     115      , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
    122116 
    123117  END SUBROUTINE xios(set_domaingroup_attr_hdl) 
     
    126120    ( domaingroup_hdl, area_, bounds_lat_1d_, bounds_lat_2d_, bounds_lon_1d_, bounds_lon_2d_, data_dim_  & 
    127121    , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_ni_, data_nj_, domain_ref_  & 
    128     , domain_src_, group_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_  & 
    129     , long_name_, lonvalue_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_  & 
    130     , nvertex_, standard_name_, type_ ) 
     122    , group_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_, long_name_, lonvalue_1d_  & 
     123    , lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, standard_name_  & 
     124    , type_ ) 
    131125 
    132126    IMPLICIT NONE 
     
    145139      INTEGER  , OPTIONAL, INTENT(IN) :: data_nj_ 
    146140      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_ref_ 
    147       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_src_ 
    148141      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref_ 
    149142      INTEGER  , OPTIONAL, INTENT(IN) :: i_index_(:) 
     
    221214      ENDIF 
    222215 
    223       IF (PRESENT(domain_src_)) THEN 
    224         CALL cxios_set_domaingroup_domain_src(domaingroup_hdl%daddr, domain_src_, len(domain_src_)) 
    225       ENDIF 
    226  
    227216      IF (PRESENT(group_ref_)) THEN 
    228217        CALL cxios_set_domaingroup_group_ref(domaingroup_hdl%daddr, group_ref_, len(group_ref_)) 
     
    313302  SUBROUTINE xios(get_domaingroup_attr)  & 
    314303    ( domaingroup_id, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  & 
    315     , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, domain_src  & 
    316     , group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d  & 
    317     , lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type  & 
    318      ) 
     304    , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, group_ref  & 
     305    , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  & 
     306    , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
    319307 
    320308    IMPLICIT NONE 
     
    334322      INTEGER  , OPTIONAL, INTENT(OUT) :: data_nj 
    335323      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_ref 
    336       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_src 
    337324      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref 
    338325      INTEGER  , OPTIONAL, INTENT(OUT) :: i_index(:) 
     
    361348      CALL xios(get_domaingroup_attr_hdl_)   & 
    362349      ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  & 
    363       , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, domain_src  & 
    364       , group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d  & 
    365       , lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type  & 
    366        ) 
     350      , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, group_ref  & 
     351      , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  & 
     352      , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
    367353 
    368354  END SUBROUTINE xios(get_domaingroup_attr) 
     
    370356  SUBROUTINE xios(get_domaingroup_attr_hdl)  & 
    371357    ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  & 
    372     , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, domain_src  & 
    373     , group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d  & 
    374     , lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type  & 
    375      ) 
     358    , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, group_ref  & 
     359    , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  & 
     360    , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
    376361 
    377362    IMPLICIT NONE 
     
    390375      INTEGER  , OPTIONAL, INTENT(OUT) :: data_nj 
    391376      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_ref 
    392       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_src 
    393377      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref 
    394378      INTEGER  , OPTIONAL, INTENT(OUT) :: i_index(:) 
     
    416400      CALL xios(get_domaingroup_attr_hdl_)  & 
    417401      ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  & 
    418       , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, domain_src  & 
    419       , group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d  & 
    420       , lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type  & 
    421        ) 
     402      , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, group_ref  & 
     403      , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  & 
     404      , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
    422405 
    423406  END SUBROUTINE xios(get_domaingroup_attr_hdl) 
     
    426409    ( domaingroup_hdl, area_, bounds_lat_1d_, bounds_lat_2d_, bounds_lon_1d_, bounds_lon_2d_, data_dim_  & 
    427410    , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_ni_, data_nj_, domain_ref_  & 
    428     , domain_src_, group_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_  & 
    429     , long_name_, lonvalue_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_  & 
    430     , nvertex_, standard_name_, type_ ) 
     411    , group_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_, long_name_, lonvalue_1d_  & 
     412    , lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, standard_name_  & 
     413    , type_ ) 
    431414 
    432415    IMPLICIT NONE 
     
    445428      INTEGER  , OPTIONAL, INTENT(OUT) :: data_nj_ 
    446429      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_ref_ 
    447       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_src_ 
    448430      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref_ 
    449431      INTEGER  , OPTIONAL, INTENT(OUT) :: i_index_(:) 
     
    521503      ENDIF 
    522504 
    523       IF (PRESENT(domain_src_)) THEN 
    524         CALL cxios_get_domaingroup_domain_src(domaingroup_hdl%daddr, domain_src_, len(domain_src_)) 
    525       ENDIF 
    526  
    527505      IF (PRESENT(group_ref_)) THEN 
    528506        CALL cxios_get_domaingroup_group_ref(domaingroup_hdl%daddr, group_ref_, len(group_ref_)) 
     
    613591  SUBROUTINE xios(is_defined_domaingroup_attr)  & 
    614592    ( domaingroup_id, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  & 
    615     , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, domain_src  & 
    616     , group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d  & 
    617     , lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type  & 
    618      ) 
     593    , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, group_ref  & 
     594    , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  & 
     595    , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
    619596 
    620597    IMPLICIT NONE 
     
    647624      LOGICAL, OPTIONAL, INTENT(OUT) :: domain_ref 
    648625      LOGICAL(KIND=C_BOOL) :: domain_ref_tmp 
    649       LOGICAL, OPTIONAL, INTENT(OUT) :: domain_src 
    650       LOGICAL(KIND=C_BOOL) :: domain_src_tmp 
    651626      LOGICAL, OPTIONAL, INTENT(OUT) :: group_ref 
    652627      LOGICAL(KIND=C_BOOL) :: group_ref_tmp 
     
    693668      CALL xios(is_defined_domaingroup_attr_hdl_)   & 
    694669      ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  & 
    695       , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, domain_src  & 
    696       , group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d  & 
    697       , lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type  & 
    698        ) 
     670      , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, group_ref  & 
     671      , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  & 
     672      , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
    699673 
    700674  END SUBROUTINE xios(is_defined_domaingroup_attr) 
     
    702676  SUBROUTINE xios(is_defined_domaingroup_attr_hdl)  & 
    703677    ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  & 
    704     , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, domain_src  & 
    705     , group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d  & 
    706     , lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type  & 
    707      ) 
     678    , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, group_ref  & 
     679    , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  & 
     680    , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
    708681 
    709682    IMPLICIT NONE 
     
    735708      LOGICAL, OPTIONAL, INTENT(OUT) :: domain_ref 
    736709      LOGICAL(KIND=C_BOOL) :: domain_ref_tmp 
    737       LOGICAL, OPTIONAL, INTENT(OUT) :: domain_src 
    738       LOGICAL(KIND=C_BOOL) :: domain_src_tmp 
    739710      LOGICAL, OPTIONAL, INTENT(OUT) :: group_ref 
    740711      LOGICAL(KIND=C_BOOL) :: group_ref_tmp 
     
    780751      CALL xios(is_defined_domaingroup_attr_hdl_)  & 
    781752      ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim  & 
    782       , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, domain_src  & 
    783       , group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d  & 
    784       , lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type  & 
    785        ) 
     753      , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_ref, group_ref  & 
     754      , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d  & 
     755      , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 
    786756 
    787757  END SUBROUTINE xios(is_defined_domaingroup_attr_hdl) 
     
    790760    ( domaingroup_hdl, area_, bounds_lat_1d_, bounds_lat_2d_, bounds_lon_1d_, bounds_lon_2d_, data_dim_  & 
    791761    , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_ni_, data_nj_, domain_ref_  & 
    792     , domain_src_, group_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_  & 
    793     , long_name_, lonvalue_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_  & 
    794     , nvertex_, standard_name_, type_ ) 
     762    , group_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_, long_name_, lonvalue_1d_  & 
     763    , lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, standard_name_  & 
     764    , type_ ) 
    795765 
    796766    IMPLICIT NONE 
     
    822792      LOGICAL, OPTIONAL, INTENT(OUT) :: domain_ref_ 
    823793      LOGICAL(KIND=C_BOOL) :: domain_ref__tmp 
    824       LOGICAL, OPTIONAL, INTENT(OUT) :: domain_src_ 
    825       LOGICAL(KIND=C_BOOL) :: domain_src__tmp 
    826794      LOGICAL, OPTIONAL, INTENT(OUT) :: group_ref_ 
    827795      LOGICAL(KIND=C_BOOL) :: group_ref__tmp 
     
    930898      ENDIF 
    931899 
    932       IF (PRESENT(domain_src_)) THEN 
    933         domain_src__tmp = cxios_is_defined_domaingroup_domain_src(domaingroup_hdl%daddr) 
    934         domain_src_ = domain_src__tmp 
    935       ENDIF 
    936  
    937900      IF (PRESENT(group_ref_)) THEN 
    938901        group_ref__tmp = cxios_is_defined_domaingroup_group_ref(domaingroup_hdl%daddr) 
  • XIOS/trunk/src/node/domain.cpp

    r785 r789  
    3535      , isClientAfterTransformationChecked(false), hasLonLat(false) 
    3636      , lonvalue_client(), latvalue_client(), bounds_lon_client(), bounds_lat_client() 
    37       , srcObject_(0), isRedistributed_(false) 
     37      , isRedistributed_(false) 
    3838   { /* Ne rien faire de plus */ } 
    3939 
     
    4545      , isClientAfterTransformationChecked(false), hasLonLat(false) 
    4646      , lonvalue_client(), latvalue_client(), bounds_lon_client(), bounds_lat_client() 
    47       , srcObject_(0), isRedistributed_(false) 
     47      , isRedistributed_(false) 
    4848   { /* Ne rien faire de plus */ } 
    4949 
     
    19251925  } 
    19261926 
    1927   void CDomain::solveSrcInheritance() 
    1928   { 
    1929     if (!domain_src.isEmpty()) 
    1930     { 
    1931        if (!CDomain::has(this->domain_src.getValue()))                                   \ 
    1932           ERROR("CDomain::solveSrcInheritance()",                                \ 
    1933              << "[ src_name = " << this->domain_src.getValue() << "]"                 \ 
    1934              << " invalid domain name !"); 
    1935  
    1936        srcObject_ = CDomain::get(this->domain_src.getValue()); 
    1937     } 
    1938   } 
    1939  
    1940   CDomain* CDomain::getDomainSrc() 
    1941   { 
    1942     return srcObject_; 
    1943   } 
    1944  
    19451927  /*! 
    19461928    Parse children nodes of a domain in xml file. 
  • XIOS/trunk/src/node/domain.hpp

    r775 r789  
    7777         bool hasTransformation(); 
    7878         void solveInheritanceTransformation(); 
    79          void solveSrcInheritance(); 
    80          CDomain* getDomainSrc(); 
    8179         TransMapTypes getAllTransformations(); 
    8280         void redistribute(int nbLocalDomain); 
     
    197195         std::vector<int> nGlobDomain_; 
    198196         bool isUnstructed_; 
    199          CDomain* srcObject_; 
    200197 
    201198         DECLARE_REF_FUNC(Domain,domain) 
  • XIOS/trunk/src/node/grid.cpp

    r777 r789  
    12401240      { 
    12411241        pDom->solveRefInheritance(apply); 
    1242         pDom->solveSrcInheritance(); 
    12431242        pDom->solveInheritanceTransformation(); 
    12441243      } 
Note: See TracChangeset for help on using the changeset viewer.