Changeset 789
- Timestamp:
- 11/16/15 16:21:45 (8 years ago)
- Location:
- XIOS/trunk/src
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/config/domain_attribute.conf
r781 r789 53 53 DECLARE_ENUM3(type,rectilinear,curvilinear,unstructured) 54 54 DECLARE_ATTRIBUTE(StdString, domain_ref) 55 DECLARE_ATTRIBUTE(StdString, domain_src) -
XIOS/trunk/src/interface/c_attr/icdomain_attr.cpp
r781 r789 334 334 335 335 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 362 336 void cxios_set_domain_i_index(domain_Ptr domain_hdl, int* i_index, int* extent) 363 337 { -
XIOS/trunk/src/interface/c_attr/icdomaingroup_attr.cpp
r781 r789 334 334 335 335 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 362 336 void cxios_set_domaingroup_group_ref(domaingroup_Ptr domaingroup_hdl, const char * group_ref, int group_ref_size) 363 337 { -
XIOS/trunk/src/interface/fortran_attr/domain_interface_attr.F90
r781 r789 273 273 274 274 275 SUBROUTINE cxios_set_domain_domain_src(domain_hdl, domain_src, domain_src_size) BIND(C)276 USE ISO_C_BINDING277 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl278 CHARACTER(kind = C_CHAR) , DIMENSION(*) :: domain_src279 INTEGER (kind = C_INT) , VALUE :: domain_src_size280 END SUBROUTINE cxios_set_domain_domain_src281 282 SUBROUTINE cxios_get_domain_domain_src(domain_hdl, domain_src, domain_src_size) BIND(C)283 USE ISO_C_BINDING284 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl285 CHARACTER(kind = C_CHAR) , DIMENSION(*) :: domain_src286 INTEGER (kind = C_INT) , VALUE :: domain_src_size287 END SUBROUTINE cxios_get_domain_domain_src288 289 FUNCTION cxios_is_defined_domain_domain_src(domain_hdl) BIND(C)290 USE ISO_C_BINDING291 LOGICAL(kind=C_BOOL) :: cxios_is_defined_domain_domain_src292 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl293 END FUNCTION cxios_is_defined_domain_domain_src294 295 296 275 SUBROUTINE cxios_set_domain_i_index(domain_hdl, i_index, extent) BIND(C) 297 276 USE ISO_C_BINDING -
XIOS/trunk/src/interface/fortran_attr/domaingroup_interface_attr.F90
r781 r789 273 273 274 274 275 SUBROUTINE cxios_set_domaingroup_domain_src(domaingroup_hdl, domain_src, domain_src_size) BIND(C)276 USE ISO_C_BINDING277 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl278 CHARACTER(kind = C_CHAR) , DIMENSION(*) :: domain_src279 INTEGER (kind = C_INT) , VALUE :: domain_src_size280 END SUBROUTINE cxios_set_domaingroup_domain_src281 282 SUBROUTINE cxios_get_domaingroup_domain_src(domaingroup_hdl, domain_src, domain_src_size) BIND(C)283 USE ISO_C_BINDING284 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl285 CHARACTER(kind = C_CHAR) , DIMENSION(*) :: domain_src286 INTEGER (kind = C_INT) , VALUE :: domain_src_size287 END SUBROUTINE cxios_get_domaingroup_domain_src288 289 FUNCTION cxios_is_defined_domaingroup_domain_src(domaingroup_hdl) BIND(C)290 USE ISO_C_BINDING291 LOGICAL(kind=C_BOOL) :: cxios_is_defined_domaingroup_domain_src292 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl293 END FUNCTION cxios_is_defined_domaingroup_domain_src294 295 296 275 SUBROUTINE cxios_set_domaingroup_group_ref(domaingroup_hdl, group_ref, group_ref_size) BIND(C) 297 276 USE ISO_C_BINDING -
XIOS/trunk/src/interface/fortran_attr/idomain_attr.F90
r781 r789 13 13 SUBROUTINE xios(set_domain_attr) & 14 14 ( 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 ) 18 18 19 19 IMPLICIT NONE … … 33 33 INTEGER , OPTIONAL, INTENT(IN) :: data_nj 34 34 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_ref 35 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_src36 35 INTEGER , OPTIONAL, INTENT(IN) :: i_index(:) 37 36 INTEGER , OPTIONAL, INTENT(IN) :: ibegin … … 59 58 CALL xios(set_domain_attr_hdl_) & 60 59 ( 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 ) 64 63 65 64 END SUBROUTINE xios(set_domain_attr) … … 67 66 SUBROUTINE xios(set_domain_attr_hdl) & 68 67 ( 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 ) 72 71 73 72 IMPLICIT NONE … … 86 85 INTEGER , OPTIONAL, INTENT(IN) :: data_nj 87 86 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_ref 88 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_src89 87 INTEGER , OPTIONAL, INTENT(IN) :: i_index(:) 90 88 INTEGER , OPTIONAL, INTENT(IN) :: ibegin … … 111 109 CALL xios(set_domain_attr_hdl_) & 112 110 ( 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 ) 116 114 117 115 END SUBROUTINE xios(set_domain_attr_hdl) … … 120 118 ( domain_hdl, area_, bounds_lat_1d_, bounds_lat_2d_, bounds_lon_1d_, bounds_lon_2d_, data_dim_ & 121 119 , 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_ ) 125 123 126 124 IMPLICIT NONE … … 139 137 INTEGER , OPTIONAL, INTENT(IN) :: data_nj_ 140 138 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_ref_ 141 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_src_142 139 INTEGER , OPTIONAL, INTENT(IN) :: i_index_(:) 143 140 INTEGER , OPTIONAL, INTENT(IN) :: ibegin_ … … 214 211 ENDIF 215 212 216 IF (PRESENT(domain_src_)) THEN217 CALL cxios_set_domain_domain_src(domain_hdl%daddr, domain_src_, len(domain_src_))218 ENDIF219 220 213 IF (PRESENT(i_index_)) THEN 221 214 CALL cxios_set_domain_i_index(domain_hdl%daddr, i_index_, SHAPE(i_index_)) … … 302 295 SUBROUTINE xios(get_domain_attr) & 303 296 ( 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 ) 307 300 308 301 IMPLICIT NONE … … 322 315 INTEGER , OPTIONAL, INTENT(OUT) :: data_nj 323 316 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_ref 324 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_src325 317 INTEGER , OPTIONAL, INTENT(OUT) :: i_index(:) 326 318 INTEGER , OPTIONAL, INTENT(OUT) :: ibegin … … 348 340 CALL xios(get_domain_attr_hdl_) & 349 341 ( 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 ) 353 345 354 346 END SUBROUTINE xios(get_domain_attr) … … 356 348 SUBROUTINE xios(get_domain_attr_hdl) & 357 349 ( 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 ) 361 353 362 354 IMPLICIT NONE … … 375 367 INTEGER , OPTIONAL, INTENT(OUT) :: data_nj 376 368 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_ref 377 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_src378 369 INTEGER , OPTIONAL, INTENT(OUT) :: i_index(:) 379 370 INTEGER , OPTIONAL, INTENT(OUT) :: ibegin … … 400 391 CALL xios(get_domain_attr_hdl_) & 401 392 ( 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 ) 405 396 406 397 END SUBROUTINE xios(get_domain_attr_hdl) … … 409 400 ( domain_hdl, area_, bounds_lat_1d_, bounds_lat_2d_, bounds_lon_1d_, bounds_lon_2d_, data_dim_ & 410 401 , 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_ ) 414 405 415 406 IMPLICIT NONE … … 428 419 INTEGER , OPTIONAL, INTENT(OUT) :: data_nj_ 429 420 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_ref_ 430 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_src_431 421 INTEGER , OPTIONAL, INTENT(OUT) :: i_index_(:) 432 422 INTEGER , OPTIONAL, INTENT(OUT) :: ibegin_ … … 503 493 ENDIF 504 494 505 IF (PRESENT(domain_src_)) THEN506 CALL cxios_get_domain_domain_src(domain_hdl%daddr, domain_src_, len(domain_src_))507 ENDIF508 509 495 IF (PRESENT(i_index_)) THEN 510 496 CALL cxios_get_domain_i_index(domain_hdl%daddr, i_index_, SHAPE(i_index_)) … … 591 577 SUBROUTINE xios(is_defined_domain_attr) & 592 578 ( 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 ) 596 582 597 583 IMPLICIT NONE … … 624 610 LOGICAL, OPTIONAL, INTENT(OUT) :: domain_ref 625 611 LOGICAL(KIND=C_BOOL) :: domain_ref_tmp 626 LOGICAL, OPTIONAL, INTENT(OUT) :: domain_src627 LOGICAL(KIND=C_BOOL) :: domain_src_tmp628 612 LOGICAL, OPTIONAL, INTENT(OUT) :: i_index 629 613 LOGICAL(KIND=C_BOOL) :: i_index_tmp … … 668 652 CALL xios(is_defined_domain_attr_hdl_) & 669 653 ( 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 ) 673 657 674 658 END SUBROUTINE xios(is_defined_domain_attr) … … 676 660 SUBROUTINE xios(is_defined_domain_attr_hdl) & 677 661 ( 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 ) 681 665 682 666 IMPLICIT NONE … … 708 692 LOGICAL, OPTIONAL, INTENT(OUT) :: domain_ref 709 693 LOGICAL(KIND=C_BOOL) :: domain_ref_tmp 710 LOGICAL, OPTIONAL, INTENT(OUT) :: domain_src711 LOGICAL(KIND=C_BOOL) :: domain_src_tmp712 694 LOGICAL, OPTIONAL, INTENT(OUT) :: i_index 713 695 LOGICAL(KIND=C_BOOL) :: i_index_tmp … … 751 733 CALL xios(is_defined_domain_attr_hdl_) & 752 734 ( 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 ) 756 738 757 739 END SUBROUTINE xios(is_defined_domain_attr_hdl) … … 760 742 ( domain_hdl, area_, bounds_lat_1d_, bounds_lat_2d_, bounds_lon_1d_, bounds_lon_2d_, data_dim_ & 761 743 , 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_ ) 765 747 766 748 IMPLICIT NONE … … 792 774 LOGICAL, OPTIONAL, INTENT(OUT) :: domain_ref_ 793 775 LOGICAL(KIND=C_BOOL) :: domain_ref__tmp 794 LOGICAL, OPTIONAL, INTENT(OUT) :: domain_src_795 LOGICAL(KIND=C_BOOL) :: domain_src__tmp796 776 LOGICAL, OPTIONAL, INTENT(OUT) :: i_index_ 797 777 LOGICAL(KIND=C_BOOL) :: i_index__tmp … … 898 878 ENDIF 899 879 900 IF (PRESENT(domain_src_)) THEN901 domain_src__tmp = cxios_is_defined_domain_domain_src(domain_hdl%daddr)902 domain_src_ = domain_src__tmp903 ENDIF904 905 880 IF (PRESENT(i_index_)) THEN 906 881 i_index__tmp = cxios_is_defined_domain_i_index(domain_hdl%daddr) -
XIOS/trunk/src/interface/fortran_attr/idomaingroup_attr.F90
r781 r789 13 13 SUBROUTINE xios(set_domaingroup_attr) & 14 14 ( 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 ) 19 18 20 19 IMPLICIT NONE … … 34 33 INTEGER , OPTIONAL, INTENT(IN) :: data_nj 35 34 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_ref 36 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_src37 35 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref 38 36 INTEGER , OPTIONAL, INTENT(IN) :: i_index(:) … … 61 59 CALL xios(set_domaingroup_attr_hdl_) & 62 60 ( 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 ) 67 64 68 65 END SUBROUTINE xios(set_domaingroup_attr) … … 70 67 SUBROUTINE xios(set_domaingroup_attr_hdl) & 71 68 ( 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 ) 76 72 77 73 IMPLICIT NONE … … 90 86 INTEGER , OPTIONAL, INTENT(IN) :: data_nj 91 87 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_ref 92 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_src93 88 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref 94 89 INTEGER , OPTIONAL, INTENT(IN) :: i_index(:) … … 116 111 CALL xios(set_domaingroup_attr_hdl_) & 117 112 ( 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 ) 122 116 123 117 END SUBROUTINE xios(set_domaingroup_attr_hdl) … … 126 120 ( domaingroup_hdl, area_, bounds_lat_1d_, bounds_lat_2d_, bounds_lon_1d_, bounds_lon_2d_, data_dim_ & 127 121 , 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 , lon g_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_ ) 131 125 132 126 IMPLICIT NONE … … 145 139 INTEGER , OPTIONAL, INTENT(IN) :: data_nj_ 146 140 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_ref_ 147 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_src_148 141 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref_ 149 142 INTEGER , OPTIONAL, INTENT(IN) :: i_index_(:) … … 221 214 ENDIF 222 215 223 IF (PRESENT(domain_src_)) THEN224 CALL cxios_set_domaingroup_domain_src(domaingroup_hdl%daddr, domain_src_, len(domain_src_))225 ENDIF226 227 216 IF (PRESENT(group_ref_)) THEN 228 217 CALL cxios_set_domaingroup_group_ref(domaingroup_hdl%daddr, group_ref_, len(group_ref_)) … … 313 302 SUBROUTINE xios(get_domaingroup_attr) & 314 303 ( 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 ) 319 307 320 308 IMPLICIT NONE … … 334 322 INTEGER , OPTIONAL, INTENT(OUT) :: data_nj 335 323 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_ref 336 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_src337 324 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref 338 325 INTEGER , OPTIONAL, INTENT(OUT) :: i_index(:) … … 361 348 CALL xios(get_domaingroup_attr_hdl_) & 362 349 ( 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 ) 367 353 368 354 END SUBROUTINE xios(get_domaingroup_attr) … … 370 356 SUBROUTINE xios(get_domaingroup_attr_hdl) & 371 357 ( 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 ) 376 361 377 362 IMPLICIT NONE … … 390 375 INTEGER , OPTIONAL, INTENT(OUT) :: data_nj 391 376 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_ref 392 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_src393 377 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref 394 378 INTEGER , OPTIONAL, INTENT(OUT) :: i_index(:) … … 416 400 CALL xios(get_domaingroup_attr_hdl_) & 417 401 ( 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 ) 422 405 423 406 END SUBROUTINE xios(get_domaingroup_attr_hdl) … … 426 409 ( domaingroup_hdl, area_, bounds_lat_1d_, bounds_lat_2d_, bounds_lon_1d_, bounds_lon_2d_, data_dim_ & 427 410 , 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 , lon g_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_ ) 431 414 432 415 IMPLICIT NONE … … 445 428 INTEGER , OPTIONAL, INTENT(OUT) :: data_nj_ 446 429 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_ref_ 447 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_src_448 430 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref_ 449 431 INTEGER , OPTIONAL, INTENT(OUT) :: i_index_(:) … … 521 503 ENDIF 522 504 523 IF (PRESENT(domain_src_)) THEN524 CALL cxios_get_domaingroup_domain_src(domaingroup_hdl%daddr, domain_src_, len(domain_src_))525 ENDIF526 527 505 IF (PRESENT(group_ref_)) THEN 528 506 CALL cxios_get_domaingroup_group_ref(domaingroup_hdl%daddr, group_ref_, len(group_ref_)) … … 613 591 SUBROUTINE xios(is_defined_domaingroup_attr) & 614 592 ( 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 ) 619 596 620 597 IMPLICIT NONE … … 647 624 LOGICAL, OPTIONAL, INTENT(OUT) :: domain_ref 648 625 LOGICAL(KIND=C_BOOL) :: domain_ref_tmp 649 LOGICAL, OPTIONAL, INTENT(OUT) :: domain_src650 LOGICAL(KIND=C_BOOL) :: domain_src_tmp651 626 LOGICAL, OPTIONAL, INTENT(OUT) :: group_ref 652 627 LOGICAL(KIND=C_BOOL) :: group_ref_tmp … … 693 668 CALL xios(is_defined_domaingroup_attr_hdl_) & 694 669 ( 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 ) 699 673 700 674 END SUBROUTINE xios(is_defined_domaingroup_attr) … … 702 676 SUBROUTINE xios(is_defined_domaingroup_attr_hdl) & 703 677 ( 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 ) 708 681 709 682 IMPLICIT NONE … … 735 708 LOGICAL, OPTIONAL, INTENT(OUT) :: domain_ref 736 709 LOGICAL(KIND=C_BOOL) :: domain_ref_tmp 737 LOGICAL, OPTIONAL, INTENT(OUT) :: domain_src738 LOGICAL(KIND=C_BOOL) :: domain_src_tmp739 710 LOGICAL, OPTIONAL, INTENT(OUT) :: group_ref 740 711 LOGICAL(KIND=C_BOOL) :: group_ref_tmp … … 780 751 CALL xios(is_defined_domaingroup_attr_hdl_) & 781 752 ( 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 ) 786 756 787 757 END SUBROUTINE xios(is_defined_domaingroup_attr_hdl) … … 790 760 ( domaingroup_hdl, area_, bounds_lat_1d_, bounds_lat_2d_, bounds_lon_1d_, bounds_lon_2d_, data_dim_ & 791 761 , 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 , lon g_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_ ) 795 765 796 766 IMPLICIT NONE … … 822 792 LOGICAL, OPTIONAL, INTENT(OUT) :: domain_ref_ 823 793 LOGICAL(KIND=C_BOOL) :: domain_ref__tmp 824 LOGICAL, OPTIONAL, INTENT(OUT) :: domain_src_825 LOGICAL(KIND=C_BOOL) :: domain_src__tmp826 794 LOGICAL, OPTIONAL, INTENT(OUT) :: group_ref_ 827 795 LOGICAL(KIND=C_BOOL) :: group_ref__tmp … … 930 898 ENDIF 931 899 932 IF (PRESENT(domain_src_)) THEN933 domain_src__tmp = cxios_is_defined_domaingroup_domain_src(domaingroup_hdl%daddr)934 domain_src_ = domain_src__tmp935 ENDIF936 937 900 IF (PRESENT(group_ref_)) THEN 938 901 group_ref__tmp = cxios_is_defined_domaingroup_group_ref(domaingroup_hdl%daddr) -
XIOS/trunk/src/node/domain.cpp
r785 r789 35 35 , isClientAfterTransformationChecked(false), hasLonLat(false) 36 36 , lonvalue_client(), latvalue_client(), bounds_lon_client(), bounds_lat_client() 37 , srcObject_(0),isRedistributed_(false)37 , isRedistributed_(false) 38 38 { /* Ne rien faire de plus */ } 39 39 … … 45 45 , isClientAfterTransformationChecked(false), hasLonLat(false) 46 46 , lonvalue_client(), latvalue_client(), bounds_lon_client(), bounds_lat_client() 47 , srcObject_(0),isRedistributed_(false)47 , isRedistributed_(false) 48 48 { /* Ne rien faire de plus */ } 49 49 … … 1925 1925 } 1926 1926 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 1945 1927 /*! 1946 1928 Parse children nodes of a domain in xml file. -
XIOS/trunk/src/node/domain.hpp
r775 r789 77 77 bool hasTransformation(); 78 78 void solveInheritanceTransformation(); 79 void solveSrcInheritance();80 CDomain* getDomainSrc();81 79 TransMapTypes getAllTransformations(); 82 80 void redistribute(int nbLocalDomain); … … 197 195 std::vector<int> nGlobDomain_; 198 196 bool isUnstructed_; 199 CDomain* srcObject_;200 197 201 198 DECLARE_REF_FUNC(Domain,domain) -
XIOS/trunk/src/node/grid.cpp
r777 r789 1240 1240 { 1241 1241 pDom->solveRefInheritance(apply); 1242 pDom->solveSrcInheritance();1243 1242 pDom->solveInheritanceTransformation(); 1244 1243 }
Note: See TracChangeset
for help on using the changeset viewer.