Changeset 690
- Timestamp:
- 09/15/15 17:31:19 (9 years ago)
- Location:
- XIOS/trunk/src
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/filter/spatial_transform_filter.cpp
r688 r690 126 126 127 127 std::vector<MPI_Status> requestStatus(sendRequest.size()); 128 MPI_Wait(&sendRequest[0], &requestStatus[0]);128 if (!sendRequest.empty()) MPI_Wait(&sendRequest[0], &requestStatus[0]); 129 129 if (0 != sendBuffSize) delete [] sendBuff; 130 130 if (0 != recvBuffSize) delete [] recvBuff; -
XIOS/trunk/src/interface/c_attr/icdomain_attr.cpp
- Property svn:executable set to *
r674 r690 360 360 361 361 362 void cxios_set_domain_i_index(domain_Ptr domain_hdl, int* i_index, int* extent) 362 void cxios_set_domain_domain_src(domain_Ptr domain_hdl, const char * domain_src, int domain_src_size) 363 { 364 std::string domain_src_str; 365 if (!cstr2string(domain_src, domain_src_size, domain_src_str)) return; 366 CTimer::get("XIOS").resume(); 367 domain_hdl->domain_src.setValue(domain_src_str); 368 CTimer::get("XIOS").suspend(); 369 } 370 371 void cxios_get_domain_domain_src(domain_Ptr domain_hdl, char * domain_src, int domain_src_size) 372 { 373 CTimer::get("XIOS").resume(); 374 if (!string_copy(domain_hdl->domain_src.getInheritedValue(), domain_src, domain_src_size)) 375 ERROR("void cxios_get_domain_domain_src(domain_Ptr domain_hdl, char * domain_src, int domain_src_size)", << "Input string is too short"); 376 CTimer::get("XIOS").suspend(); 377 } 378 379 bool cxios_is_defined_domain_domain_src(domain_Ptr domain_hdl) 380 { 381 CTimer::get("XIOS").resume(); 382 bool isDefined = domain_hdl->domain_src.hasInheritedValue(); 383 CTimer::get("XIOS").suspend(); 384 return isDefined; 385 } 386 387 388 void cxios_set_domain_i_index(domain_Ptr domain_hdl, int* i_index, int extent1) 363 389 { 364 390 CTimer::get("XIOS").resume(); -
XIOS/trunk/src/interface/c_attr/icdomaingroup_attr.cpp
r674 r690 360 360 361 361 362 void cxios_set_domaingroup_domain_src(domaingroup_Ptr domaingroup_hdl, const char * domain_src, int domain_src_size) 363 { 364 std::string domain_src_str; 365 if (!cstr2string(domain_src, domain_src_size, domain_src_str)) return; 366 CTimer::get("XIOS").resume(); 367 domaingroup_hdl->domain_src.setValue(domain_src_str); 368 CTimer::get("XIOS").suspend(); 369 } 370 371 void cxios_get_domaingroup_domain_src(domaingroup_Ptr domaingroup_hdl, char * domain_src, int domain_src_size) 372 { 373 CTimer::get("XIOS").resume(); 374 if (!string_copy(domaingroup_hdl->domain_src.getInheritedValue(), domain_src, domain_src_size)) 375 ERROR("void cxios_get_domaingroup_domain_src(domaingroup_Ptr domaingroup_hdl, char * domain_src, int domain_src_size)", << "Input string is too short"); 376 CTimer::get("XIOS").suspend(); 377 } 378 379 bool cxios_is_defined_domaingroup_domain_src(domaingroup_Ptr domaingroup_hdl) 380 { 381 CTimer::get("XIOS").resume(); 382 bool isDefined = domaingroup_hdl->domain_src.hasInheritedValue(); 383 CTimer::get("XIOS").suspend(); 384 return isDefined; 385 } 386 387 362 388 void cxios_set_domaingroup_group_ref(domaingroup_Ptr domaingroup_hdl, const char * group_ref, int group_ref_size) 363 389 { -
XIOS/trunk/src/interface/fortran_attr/domain_interface_attr.F90
- Property svn:executable set to *
r674 r690 294 294 295 295 296 SUBROUTINE cxios_set_domain_i_index(domain_hdl, i_index, extent) BIND(C) 296 SUBROUTINE cxios_set_domain_domain_src(domain_hdl, domain_src, domain_src_size) BIND(C) 297 USE ISO_C_BINDING 298 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 299 CHARACTER(kind = C_CHAR) , DIMENSION(*) :: domain_src 300 INTEGER (kind = C_INT) , VALUE :: domain_src_size 301 END SUBROUTINE cxios_set_domain_domain_src 302 303 SUBROUTINE cxios_get_domain_domain_src(domain_hdl, domain_src, domain_src_size) BIND(C) 304 USE ISO_C_BINDING 305 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 306 CHARACTER(kind = C_CHAR) , DIMENSION(*) :: domain_src 307 INTEGER (kind = C_INT) , VALUE :: domain_src_size 308 END SUBROUTINE cxios_get_domain_domain_src 309 310 FUNCTION cxios_is_defined_domain_domain_src(domain_hdl) BIND(C) 311 USE ISO_C_BINDING 312 LOGICAL(kind=C_BOOL) :: cxios_is_defined_domain_domain_src 313 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 314 END FUNCTION cxios_is_defined_domain_domain_src 315 316 317 SUBROUTINE cxios_set_domain_i_index(domain_hdl, i_index, extent1) BIND(C) 297 318 USE ISO_C_BINDING 298 319 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl -
XIOS/trunk/src/interface/fortran_attr/domaingroup_interface_attr.F90
r674 r690 294 294 295 295 296 SUBROUTINE cxios_set_domaingroup_domain_src(domaingroup_hdl, domain_src, domain_src_size) BIND(C) 297 USE ISO_C_BINDING 298 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 299 CHARACTER(kind = C_CHAR) , DIMENSION(*) :: domain_src 300 INTEGER (kind = C_INT) , VALUE :: domain_src_size 301 END SUBROUTINE cxios_set_domaingroup_domain_src 302 303 SUBROUTINE cxios_get_domaingroup_domain_src(domaingroup_hdl, domain_src, domain_src_size) BIND(C) 304 USE ISO_C_BINDING 305 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 306 CHARACTER(kind = C_CHAR) , DIMENSION(*) :: domain_src 307 INTEGER (kind = C_INT) , VALUE :: domain_src_size 308 END SUBROUTINE cxios_get_domaingroup_domain_src 309 310 FUNCTION cxios_is_defined_domaingroup_domain_src(domaingroup_hdl) BIND(C) 311 USE ISO_C_BINDING 312 LOGICAL(kind=C_BOOL) :: cxios_is_defined_domaingroup_domain_src 313 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 314 END FUNCTION cxios_is_defined_domaingroup_domain_src 315 316 296 317 SUBROUTINE cxios_set_domaingroup_group_ref(domaingroup_hdl, group_ref, group_ref_size) BIND(C) 297 318 USE ISO_C_BINDING -
XIOS/trunk/src/interface/fortran_attr/idomain_attr.F90
r674 r690 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_group_ref, domain_ref, i_index&16 , i begin, 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_group_ref, domain_ref, domain_src & 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 ) 18 18 19 19 IMPLICIT NONE … … 34 34 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_group_ref 35 35 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_ref 36 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_src 36 37 INTEGER , OPTIONAL, INTENT(IN) :: i_index(:) 37 38 INTEGER , OPTIONAL, INTENT(IN) :: ibegin … … 59 60 CALL xios(set_domain_attr_hdl_) & 60 61 ( 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_group_ref, domain_ref, i_index&62 , i begin, 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 )62 , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref, domain_src & 63 , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d & 64 , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 64 65 65 66 END SUBROUTINE xios(set_domain_attr) … … 67 68 SUBROUTINE xios(set_domain_attr_hdl) & 68 69 ( 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_group_ref, domain_ref, i_index&70 , i begin, 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 )70 , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref, domain_src & 71 , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d & 72 , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 72 73 73 74 IMPLICIT NONE … … 87 88 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_group_ref 88 89 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_ref 90 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_src 89 91 INTEGER , OPTIONAL, INTENT(IN) :: i_index(:) 90 92 INTEGER , OPTIONAL, INTENT(IN) :: ibegin … … 111 113 CALL xios(set_domain_attr_hdl_) & 112 114 ( 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_group_ref, domain_ref, i_index&114 , i begin, 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 )115 , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref, domain_src & 116 , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d & 117 , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 116 118 117 119 END SUBROUTINE xios(set_domain_attr_hdl) … … 120 122 ( domain_hdl, area_, bounds_lat_1d_, bounds_lat_2d_, bounds_lon_1d_, bounds_lon_2d_, data_dim_ & 121 123 , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_ni_, data_nj_, domain_group_ref_ & 122 , domain_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_, long_name_ &123 , lon value_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_ &124 , standard_name_, type_ )124 , domain_ref_, domain_src_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_ & 125 , long_name_, lonvalue_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_ & 126 , nvertex_, standard_name_, type_ ) 125 127 126 128 IMPLICIT NONE … … 140 142 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_group_ref_ 141 143 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_ref_ 144 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_src_ 142 145 INTEGER , OPTIONAL, INTENT(IN) :: i_index_(:) 143 146 INTEGER , OPTIONAL, INTENT(IN) :: ibegin_ … … 218 221 ENDIF 219 222 223 IF (PRESENT(domain_src_)) THEN 224 CALL cxios_set_domain_domain_src(domain_hdl%daddr, domain_src_, len(domain_src_)) 225 ENDIF 226 220 227 IF (PRESENT(i_index_)) THEN 221 228 CALL cxios_set_domain_i_index(domain_hdl%daddr, i_index_, SHAPE(i_index_)) … … 302 309 SUBROUTINE xios(get_domain_attr) & 303 310 ( 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_group_ref, domain_ref, i_index&305 , i begin, 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 )311 , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref, domain_src & 312 , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d & 313 , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 307 314 308 315 IMPLICIT NONE … … 323 330 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_group_ref 324 331 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_ref 332 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_src 325 333 INTEGER , OPTIONAL, INTENT(OUT) :: i_index(:) 326 334 INTEGER , OPTIONAL, INTENT(OUT) :: ibegin … … 348 356 CALL xios(get_domain_attr_hdl_) & 349 357 ( 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_group_ref, domain_ref, i_index&351 , i begin, 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 )358 , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref, domain_src & 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 ) 353 361 354 362 END SUBROUTINE xios(get_domain_attr) … … 356 364 SUBROUTINE xios(get_domain_attr_hdl) & 357 365 ( 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_group_ref, domain_ref, i_index&359 , i begin, 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 )366 , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref, domain_src & 367 , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d & 368 , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 361 369 362 370 IMPLICIT NONE … … 376 384 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_group_ref 377 385 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_ref 386 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_src 378 387 INTEGER , OPTIONAL, INTENT(OUT) :: i_index(:) 379 388 INTEGER , OPTIONAL, INTENT(OUT) :: ibegin … … 400 409 CALL xios(get_domain_attr_hdl_) & 401 410 ( 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_group_ref, domain_ref, i_index&403 , i begin, 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 )411 , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref, domain_src & 412 , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d & 413 , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 405 414 406 415 END SUBROUTINE xios(get_domain_attr_hdl) … … 409 418 ( domain_hdl, area_, bounds_lat_1d_, bounds_lat_2d_, bounds_lon_1d_, bounds_lon_2d_, data_dim_ & 410 419 , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_ni_, data_nj_, domain_group_ref_ & 411 , domain_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_, long_name_ &412 , lon value_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_ &413 , standard_name_, type_ )420 , domain_ref_, domain_src_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_ & 421 , long_name_, lonvalue_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_ & 422 , nvertex_, standard_name_, type_ ) 414 423 415 424 IMPLICIT NONE … … 429 438 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_group_ref_ 430 439 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_ref_ 440 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_src_ 431 441 INTEGER , OPTIONAL, INTENT(OUT) :: i_index_(:) 432 442 INTEGER , OPTIONAL, INTENT(OUT) :: ibegin_ … … 507 517 ENDIF 508 518 519 IF (PRESENT(domain_src_)) THEN 520 CALL cxios_get_domain_domain_src(domain_hdl%daddr, domain_src_, len(domain_src_)) 521 ENDIF 522 509 523 IF (PRESENT(i_index_)) THEN 510 524 CALL cxios_get_domain_i_index(domain_hdl%daddr, i_index_, SHAPE(i_index_)) … … 591 605 SUBROUTINE xios(is_defined_domain_attr) & 592 606 ( 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_group_ref, domain_ref, i_index&594 , i begin, 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 )607 , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref, domain_src & 608 , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d & 609 , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 596 610 597 611 IMPLICIT NONE … … 626 640 LOGICAL, OPTIONAL, INTENT(OUT) :: domain_ref 627 641 LOGICAL(KIND=C_BOOL) :: domain_ref_tmp 642 LOGICAL, OPTIONAL, INTENT(OUT) :: domain_src 643 LOGICAL(KIND=C_BOOL) :: domain_src_tmp 628 644 LOGICAL, OPTIONAL, INTENT(OUT) :: i_index 629 645 LOGICAL(KIND=C_BOOL) :: i_index_tmp … … 668 684 CALL xios(is_defined_domain_attr_hdl_) & 669 685 ( 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_group_ref, domain_ref, i_index&671 , i begin, 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 )686 , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref, domain_src & 687 , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d & 688 , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 673 689 674 690 END SUBROUTINE xios(is_defined_domain_attr) … … 676 692 SUBROUTINE xios(is_defined_domain_attr_hdl) & 677 693 ( 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_group_ref, domain_ref, i_index&679 , i begin, 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 )694 , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref, domain_src & 695 , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d & 696 , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 681 697 682 698 IMPLICIT NONE … … 710 726 LOGICAL, OPTIONAL, INTENT(OUT) :: domain_ref 711 727 LOGICAL(KIND=C_BOOL) :: domain_ref_tmp 728 LOGICAL, OPTIONAL, INTENT(OUT) :: domain_src 729 LOGICAL(KIND=C_BOOL) :: domain_src_tmp 712 730 LOGICAL, OPTIONAL, INTENT(OUT) :: i_index 713 731 LOGICAL(KIND=C_BOOL) :: i_index_tmp … … 751 769 CALL xios(is_defined_domain_attr_hdl_) & 752 770 ( 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_group_ref, domain_ref, i_index&754 , i begin, 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 )771 , data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref, domain_src & 772 , i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name, lonvalue_1d, lonvalue_2d & 773 , mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name, type ) 756 774 757 775 END SUBROUTINE xios(is_defined_domain_attr_hdl) … … 760 778 ( domain_hdl, area_, bounds_lat_1d_, bounds_lat_2d_, bounds_lon_1d_, bounds_lon_2d_, data_dim_ & 761 779 , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_ni_, data_nj_, domain_group_ref_ & 762 , domain_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_, long_name_ &763 , lon value_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_ &764 , standard_name_, type_ )780 , domain_ref_, domain_src_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_ & 781 , long_name_, lonvalue_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_ & 782 , nvertex_, standard_name_, type_ ) 765 783 766 784 IMPLICIT NONE … … 794 812 LOGICAL, OPTIONAL, INTENT(OUT) :: domain_ref_ 795 813 LOGICAL(KIND=C_BOOL) :: domain_ref__tmp 814 LOGICAL, OPTIONAL, INTENT(OUT) :: domain_src_ 815 LOGICAL(KIND=C_BOOL) :: domain_src__tmp 796 816 LOGICAL, OPTIONAL, INTENT(OUT) :: i_index_ 797 817 LOGICAL(KIND=C_BOOL) :: i_index__tmp … … 903 923 ENDIF 904 924 925 IF (PRESENT(domain_src_)) THEN 926 domain_src__tmp = cxios_is_defined_domain_domain_src(domain_hdl%daddr) 927 domain_src_ = domain_src__tmp 928 ENDIF 929 905 930 IF (PRESENT(i_index_)) THEN 906 931 i_index__tmp = cxios_is_defined_domain_i_index(domain_hdl%daddr) -
XIOS/trunk/src/interface/fortran_attr/idomaingroup_attr.F90
r674 r690 14 14 ( domaingroup_id, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim & 15 15 , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref & 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 )16 , domain_src, group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name & 17 , lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name & 18 , type ) 19 19 20 20 IMPLICIT NONE … … 35 35 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_group_ref 36 36 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_ref 37 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_src 37 38 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref 38 39 INTEGER , OPTIONAL, INTENT(IN) :: i_index(:) … … 62 63 ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim & 63 64 , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref & 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 )65 , domain_src, group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name & 66 , lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name & 67 , type ) 67 68 68 69 END SUBROUTINE xios(set_domaingroup_attr) … … 71 72 ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim & 72 73 , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref & 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 )74 , domain_src, group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name & 75 , lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name & 76 , type ) 76 77 77 78 IMPLICIT NONE … … 91 92 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_group_ref 92 93 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_ref 94 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_src 93 95 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref 94 96 INTEGER , OPTIONAL, INTENT(IN) :: i_index(:) … … 117 119 ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim & 118 120 , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref & 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 )121 , domain_src, group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name & 122 , lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name & 123 , type ) 122 124 123 125 END SUBROUTINE xios(set_domaingroup_attr_hdl) … … 126 128 ( domaingroup_hdl, area_, bounds_lat_1d_, bounds_lat_2d_, bounds_lon_1d_, bounds_lon_2d_, data_dim_ & 127 129 , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_ni_, data_nj_, domain_group_ref_ & 128 , domain_ref_, group_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_ &130 , domain_ref_, domain_src_, group_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_ & 129 131 , long_name_, lonvalue_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_ & 130 132 , nvertex_, standard_name_, type_ ) … … 146 148 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_group_ref_ 147 149 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_ref_ 150 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: domain_src_ 148 151 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref_ 149 152 INTEGER , OPTIONAL, INTENT(IN) :: i_index_(:) … … 225 228 ENDIF 226 229 230 IF (PRESENT(domain_src_)) THEN 231 CALL cxios_set_domaingroup_domain_src(domaingroup_hdl%daddr, domain_src_, len(domain_src_)) 232 ENDIF 233 227 234 IF (PRESENT(group_ref_)) THEN 228 235 CALL cxios_set_domaingroup_group_ref(domaingroup_hdl%daddr, group_ref_, len(group_ref_)) … … 314 321 ( domaingroup_id, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim & 315 322 , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref & 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 )323 , domain_src, group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name & 324 , lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name & 325 , type ) 319 326 320 327 IMPLICIT NONE … … 335 342 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_group_ref 336 343 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_ref 344 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_src 337 345 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref 338 346 INTEGER , OPTIONAL, INTENT(OUT) :: i_index(:) … … 362 370 ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim & 363 371 , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref & 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 )372 , domain_src, group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name & 373 , lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name & 374 , type ) 367 375 368 376 END SUBROUTINE xios(get_domaingroup_attr) … … 371 379 ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim & 372 380 , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref & 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 )381 , domain_src, group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name & 382 , lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name & 383 , type ) 376 384 377 385 IMPLICIT NONE … … 391 399 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_group_ref 392 400 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_ref 401 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_src 393 402 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref 394 403 INTEGER , OPTIONAL, INTENT(OUT) :: i_index(:) … … 417 426 ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim & 418 427 , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref & 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 )428 , domain_src, group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name & 429 , lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name & 430 , type ) 422 431 423 432 END SUBROUTINE xios(get_domaingroup_attr_hdl) … … 426 435 ( domaingroup_hdl, area_, bounds_lat_1d_, bounds_lat_2d_, bounds_lon_1d_, bounds_lon_2d_, data_dim_ & 427 436 , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_ni_, data_nj_, domain_group_ref_ & 428 , domain_ref_, group_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_ &437 , domain_ref_, domain_src_, group_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_ & 429 438 , long_name_, lonvalue_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_ & 430 439 , nvertex_, standard_name_, type_ ) … … 446 455 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_group_ref_ 447 456 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_ref_ 457 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: domain_src_ 448 458 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref_ 449 459 INTEGER , OPTIONAL, INTENT(OUT) :: i_index_(:) … … 525 535 ENDIF 526 536 537 IF (PRESENT(domain_src_)) THEN 538 CALL cxios_get_domaingroup_domain_src(domaingroup_hdl%daddr, domain_src_, len(domain_src_)) 539 ENDIF 540 527 541 IF (PRESENT(group_ref_)) THEN 528 542 CALL cxios_get_domaingroup_group_ref(domaingroup_hdl%daddr, group_ref_, len(group_ref_)) … … 614 628 ( domaingroup_id, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim & 615 629 , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref & 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 )630 , domain_src, group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name & 631 , lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name & 632 , type ) 619 633 620 634 IMPLICIT NONE … … 649 663 LOGICAL, OPTIONAL, INTENT(OUT) :: domain_ref 650 664 LOGICAL(KIND=C_BOOL) :: domain_ref_tmp 665 LOGICAL, OPTIONAL, INTENT(OUT) :: domain_src 666 LOGICAL(KIND=C_BOOL) :: domain_src_tmp 651 667 LOGICAL, OPTIONAL, INTENT(OUT) :: group_ref 652 668 LOGICAL(KIND=C_BOOL) :: group_ref_tmp … … 694 710 ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim & 695 711 , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref & 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 )712 , domain_src, group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name & 713 , lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name & 714 , type ) 699 715 700 716 END SUBROUTINE xios(is_defined_domaingroup_attr) … … 703 719 ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim & 704 720 , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref & 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 )721 , domain_src, group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name & 722 , lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name & 723 , type ) 708 724 709 725 IMPLICIT NONE … … 737 753 LOGICAL, OPTIONAL, INTENT(OUT) :: domain_ref 738 754 LOGICAL(KIND=C_BOOL) :: domain_ref_tmp 755 LOGICAL, OPTIONAL, INTENT(OUT) :: domain_src 756 LOGICAL(KIND=C_BOOL) :: domain_src_tmp 739 757 LOGICAL, OPTIONAL, INTENT(OUT) :: group_ref 740 758 LOGICAL(KIND=C_BOOL) :: group_ref_tmp … … 781 799 ( domaingroup_hdl, area, bounds_lat_1d, bounds_lat_2d, bounds_lon_1d, bounds_lon_2d, data_dim & 782 800 , data_i_index, data_ibegin, data_j_index, data_jbegin, data_ni, data_nj, domain_group_ref, domain_ref & 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 )801 , domain_src, group_ref, i_index, ibegin, j_index, jbegin, latvalue_1d, latvalue_2d, long_name & 802 , lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo, nj, nj_glo, nvertex, standard_name & 803 , type ) 786 804 787 805 END SUBROUTINE xios(is_defined_domaingroup_attr_hdl) … … 790 808 ( domaingroup_hdl, area_, bounds_lat_1d_, bounds_lat_2d_, bounds_lon_1d_, bounds_lon_2d_, data_dim_ & 791 809 , data_i_index_, data_ibegin_, data_j_index_, data_jbegin_, data_ni_, data_nj_, domain_group_ref_ & 792 , domain_ref_, group_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_ &810 , domain_ref_, domain_src_, group_ref_, i_index_, ibegin_, j_index_, jbegin_, latvalue_1d_, latvalue_2d_ & 793 811 , long_name_, lonvalue_1d_, lonvalue_2d_, mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_ & 794 812 , nvertex_, standard_name_, type_ ) … … 824 842 LOGICAL, OPTIONAL, INTENT(OUT) :: domain_ref_ 825 843 LOGICAL(KIND=C_BOOL) :: domain_ref__tmp 844 LOGICAL, OPTIONAL, INTENT(OUT) :: domain_src_ 845 LOGICAL(KIND=C_BOOL) :: domain_src__tmp 826 846 LOGICAL, OPTIONAL, INTENT(OUT) :: group_ref_ 827 847 LOGICAL(KIND=C_BOOL) :: group_ref__tmp … … 935 955 ENDIF 936 956 957 IF (PRESENT(domain_src_)) THEN 958 domain_src__tmp = cxios_is_defined_domaingroup_domain_src(domaingroup_hdl%daddr) 959 domain_src_ = domain_src__tmp 960 ENDIF 961 937 962 IF (PRESENT(group_ref_)) THEN 938 963 group_ref__tmp = cxios_is_defined_domaingroup_group_ref(domaingroup_hdl%daddr)
Note: See TracChangeset
for help on using the changeset viewer.