Changeset 674
- Timestamp:
- 08/25/15 10:50:21 (9 years ago)
- Location:
- XIOS/trunk/src
- Files:
-
- 22 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/generate_interface_impl.hpp
r672 r674 378 378 string typeName=getStrType<T>(); \ 379 379 \ 380 oss << "void cxios_set_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, " << typeName << "* " << name << ", int extent1)" << iendl; \380 oss << "void cxios_set_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, " << typeName << "* " << name << ", int* extent)" << iendl; \ 381 381 oss << "{" << iendl; \ 382 382 oss << " CTimer::get(\"XIOS\").resume();" << iendl; \ 383 oss << " CArray<" << typeName << ",1> tmp(" << name << ", shape(extent 1), neverDeleteData);" << iendl; \383 oss << " CArray<" << typeName << ",1> tmp(" << name << ", shape(extent[0]), neverDeleteData);" << iendl; \ 384 384 oss << " " << className << "_hdl->" << name << ".reference(tmp.copy());" << iendl; \ 385 385 /*oss << " " << className << "_hdl->sendAttributToServer(" << className << "_hdl->" << name << ");" << iendl;*/ \ … … 387 387 oss << "}" << std::endl; \ 388 388 oss << iendl; \ 389 oss << "void cxios_get_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, " << typeName << "* " << name << ", int extent1)" << iendl; \389 oss << "void cxios_get_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, " << typeName << "* " << name << ", int* extent)" << iendl; \ 390 390 oss << "{" << iendl; \ 391 391 oss << " CTimer::get(\"XIOS\").resume();" << iendl; \ 392 oss << " CArray<" << typeName << ",1> tmp(" << name << ", shape(extent 1), neverDeleteData);" << iendl; \392 oss << " CArray<" << typeName << ",1> tmp(" << name << ", shape(extent[0]), neverDeleteData);" << iendl; \ 393 393 oss << " tmp=" << className << "_hdl->" << name << ".getInheritedValue();" << iendl; \ 394 394 oss << " CTimer::get(\"XIOS\").suspend();" << iendl; \ … … 401 401 string typeName=getStrType<T>(); \ 402 402 \ 403 oss << "void cxios_set_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, " << typeName << "* " << name << ", int extent1, int extent2)" << iendl; \403 oss << "void cxios_set_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, " << typeName << "* " << name << ", int* extent)" << iendl; \ 404 404 oss << "{" << iendl; \ 405 405 oss << " CTimer::get(\"XIOS\").resume();" << iendl; \ 406 oss << " CArray<" << typeName << ",2> tmp(" << name << ", shape(extent 1, extent2), neverDeleteData);" << iendl; \406 oss << " CArray<" << typeName << ",2> tmp(" << name << ", shape(extent[0], extent[1]), neverDeleteData);" << iendl; \ 407 407 oss << " " << className << "_hdl->" << name << ".reference(tmp.copy());" << iendl; \ 408 408 /*oss << " " << className << "_hdl->sendAttributToServer(" << className << "_hdl->" << name << ");" << iendl;*/ \ … … 410 410 oss << "}" << std::endl; \ 411 411 oss << iendl; \ 412 oss << "void cxios_get_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, " << typeName << "* " << name << ", int extent1, int extent2)" << iendl; \412 oss << "void cxios_get_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, " << typeName << "* " << name << ", int* extent)" << iendl; \ 413 413 oss << "{" << iendl; \ 414 414 oss << " CTimer::get(\"XIOS\").resume();" << iendl; \ 415 oss << " CArray<" << typeName << ",2> tmp(" << name << ", shape(extent 1, extent2), neverDeleteData);" << iendl; \415 oss << " CArray<" << typeName << ",2> tmp(" << name << ", shape(extent[0], extent[1]), neverDeleteData);" << iendl; \ 416 416 oss << " tmp=" << className << "_hdl->" << name << ".getInheritedValue();" << iendl; \ 417 417 oss << " CTimer::get(\"XIOS\").suspend();" << iendl; \ … … 424 424 string typeName=getStrType<T>(); \ 425 425 \ 426 oss << "void cxios_set_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, " << typeName << "* " << name << ", int extent1, int extent2, int extent3)" << iendl; \426 oss << "void cxios_set_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, " << typeName << "* " << name << ", int* extent)" << iendl; \ 427 427 oss << "{" << iendl; \ 428 428 oss << " CTimer::get(\"XIOS\").resume();" << iendl; \ 429 oss << " CArray<" << typeName << ",3> tmp(" << name << ", shape(extent 1, extent2, extent3), neverDeleteData);" << iendl; \429 oss << " CArray<" << typeName << ",3> tmp(" << name << ", shape(extent[0], extent[1], extent[2]), neverDeleteData);" << iendl; \ 430 430 oss << " " << className << "_hdl->" << name << ".reference(tmp.copy());" << iendl; \ 431 431 /*oss << " " << className << "_hdl->sendAttributToServer(" << className << "_hdl->" << name << ");" << iendl;*/ \ … … 433 433 oss << "}" << std::endl; \ 434 434 oss << iendl; \ 435 oss << "void cxios_get_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, " << typeName << "* " << name << ", int extent1, int extent2, int extent3)" << iendl; \435 oss << "void cxios_get_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, " << typeName << "* " << name << ", int* extent)" << iendl; \ 436 436 oss << "{" << iendl; \ 437 437 oss << " CTimer::get(\"XIOS\").resume();" << iendl; \ 438 oss << " CArray<" << typeName << ",3> tmp(" << name << ", shape(extent 1, extent2, extent3), neverDeleteData);" << iendl; \438 oss << " CArray<" << typeName << ",3> tmp(" << name << ", shape(extent[0], extent[1], extent[2]), neverDeleteData);" << iendl; \ 439 439 oss << " tmp=" << className << "_hdl->" << name << ".getInheritedValue();" << iendl; \ 440 440 oss << " CTimer::get(\"XIOS\").suspend();" << iendl; \ … … 459 459 string fortranKindC=getStrFortranKindC<T>(); \ 460 460 \ 461 oss << "SUBROUTINE cxios_set_" << className << "_" << name << "(" << className << "_hdl, " << name << ", extent 1) BIND(C)" << iendl; \461 oss << "SUBROUTINE cxios_set_" << className << "_" << name << "(" << className << "_hdl, " << name << ", extent) BIND(C)" << iendl; \ 462 462 oss << " USE ISO_C_BINDING" << iendl; \ 463 463 oss << " INTEGER (kind = C_INTPTR_T), VALUE :: " << className << "_hdl" << iendl; \ 464 464 oss << " " << fortranType << " " << fortranKindC << " , DIMENSION(*) :: " << name << iendl; \ 465 oss << " INTEGER (kind = C_INT), VALUE :: extent1" << iendl; \465 oss << " INTEGER (kind = C_INT), DIMENSION(*) :: extent" << iendl; \ 466 466 oss << "END SUBROUTINE cxios_set_" << className << "_" << name << std::endl; \ 467 467 oss << iendl; \ 468 oss << "SUBROUTINE cxios_get_" << className << "_" << name << "(" << className << "_hdl, " << name << ", extent 1) BIND(C)" << iendl; \468 oss << "SUBROUTINE cxios_get_" << className << "_" << name << "(" << className << "_hdl, " << name << ", extent) BIND(C)" << iendl; \ 469 469 oss << " USE ISO_C_BINDING" << iendl; \ 470 470 oss << " INTEGER (kind = C_INTPTR_T), VALUE :: " << className << "_hdl" << iendl; \ 471 471 oss << " " << fortranType << " " << fortranKindC << " , DIMENSION(*) :: " << name << iendl; \ 472 oss << " INTEGER (kind = C_INT), VALUE :: extent1" << iendl; \472 oss << " INTEGER (kind = C_INT), DIMENSION(*) :: extent" << iendl; \ 473 473 oss << "END SUBROUTINE cxios_get_" << className << "_" << name << std::endl; \ 474 474 } \ … … 480 480 string fortranKindC=getStrFortranKindC<T>(); \ 481 481 \ 482 oss << "SUBROUTINE cxios_set_" << className << "_" << name << "(" << className << "_hdl, " << name << ", extent 1, extent2) BIND(C)" << iendl; \482 oss << "SUBROUTINE cxios_set_" << className << "_" << name << "(" << className << "_hdl, " << name << ", extent) BIND(C)" << iendl; \ 483 483 oss << " USE ISO_C_BINDING" << iendl; \ 484 484 oss << " INTEGER (kind = C_INTPTR_T), VALUE :: " << className << "_hdl" << iendl; \ 485 485 oss << " " << fortranType << " " << fortranKindC << " , DIMENSION(*) :: " << name << iendl; \ 486 oss << " INTEGER (kind = C_INT), VALUE :: extent1" << iendl; \ 487 oss << " INTEGER (kind = C_INT), VALUE :: extent2" << iendl; \ 486 oss << " INTEGER (kind = C_INT), DIMENSION(*) :: extent" << iendl; \ 488 487 oss << "END SUBROUTINE cxios_set_" << className << "_" << name << std::endl; \ 489 488 oss << iendl; \ 490 oss << "SUBROUTINE cxios_get_" << className << "_" << name << "(" << className << "_hdl, " << name << ", extent 1, extent2) BIND(C)" << iendl; \489 oss << "SUBROUTINE cxios_get_" << className << "_" << name << "(" << className << "_hdl, " << name << ", extent) BIND(C)" << iendl; \ 491 490 oss << " USE ISO_C_BINDING" << iendl; \ 492 491 oss << " INTEGER (kind = C_INTPTR_T), VALUE :: " << className << "_hdl" << iendl; \ 493 492 oss << " " << fortranType << " " << fortranKindC << " , DIMENSION(*) :: " << name << iendl; \ 494 oss << " INTEGER (kind = C_INT), VALUE :: extent1" << iendl; \ 495 oss << " INTEGER (kind = C_INT), VALUE :: extent2" << iendl; \ 493 oss << " INTEGER (kind = C_INT), DIMENSION(*) :: extent" << iendl; \ 496 494 oss << "END SUBROUTINE cxios_get_" << className << "_" << name << std::endl; \ 497 495 } \ … … 503 501 string fortranKindC=getStrFortranKindC<T>(); \ 504 502 \ 505 oss << "SUBROUTINE cxios_set_" << className << "_" << name << "(" << className << "_hdl, " << name << ", extent 1, extent2, extent3) BIND(C)" << iendl; \503 oss << "SUBROUTINE cxios_set_" << className << "_" << name << "(" << className << "_hdl, " << name << ", extent) BIND(C)" << iendl; \ 506 504 oss << " USE ISO_C_BINDING" << iendl; \ 507 505 oss << " INTEGER (kind = C_INTPTR_T), VALUE :: " << className << "_hdl" << iendl; \ 508 506 oss << " " << fortranType << " " << fortranKindC << " , DIMENSION(*) :: " << name << iendl; \ 509 oss << " INTEGER (kind = C_INT), VALUE :: extent1" << iendl; \ 510 oss << " INTEGER (kind = C_INT), VALUE :: extent2" << iendl; \ 511 oss << " INTEGER (kind = C_INT), VALUE :: extent3" << iendl; \ 507 oss << " INTEGER (kind = C_INT), DIMENSION(*) :: extent" << iendl; \ 512 508 oss << "END SUBROUTINE cxios_set_" << className << "_" << name << std::endl; \ 513 509 oss << iendl; \ 514 oss << "SUBROUTINE cxios_get_" << className << "_" << name << "(" << className << "_hdl, " << name << ", extent 1, extent2, extent3) BIND(C)" << iendl; \510 oss << "SUBROUTINE cxios_get_" << className << "_" << name << "(" << className << "_hdl, " << name << ", extent) BIND(C)" << iendl; \ 515 511 oss << " USE ISO_C_BINDING" << iendl; \ 516 512 oss << " INTEGER (kind = C_INTPTR_T), VALUE :: " << className << "_hdl" << iendl; \ 517 513 oss << " " << fortranType << " " << fortranKindC << " , DIMENSION(*) :: " << name << iendl; \ 518 oss << " INTEGER (kind = C_INT), VALUE :: extent1" << iendl; \ 519 oss << " INTEGER (kind = C_INT), VALUE :: extent2" << iendl; \ 520 oss << " INTEGER (kind = C_INT), VALUE :: extent3" << iendl; \ 514 oss << " INTEGER (kind = C_INT), DIMENSION(*) :: extent" << iendl; \ 521 515 oss << "END SUBROUTINE cxios_get_" << className << "_" << name << std::endl; \ 522 516 } … … 585 579 if (!matchingTypeCFortran<T>()) \ 586 580 { \ 587 oss << " ALLOCATE(" << name_tmp << "( size(" << name << "_,1)))" << iendl; \581 oss << " ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1)))" << iendl; \ 588 582 oss << " " << name_tmp << " = " << name << "_" << iendl; \ 589 oss << " CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", size(" << name << "_,1))" << iendl; \583 oss << " CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \ 590 584 } \ 591 else oss << " CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, size(" << name << "_,1))" << iendl; \585 else oss << " CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \ 592 586 oss << "ENDIF"; \ 593 587 } \ … … 601 595 if (!matchingTypeCFortran<T>()) \ 602 596 { \ 603 oss << " ALLOCATE(" << name_tmp << "( size(" << name << "_,1), size(" << name << "_,2)))" << iendl; \597 oss << " ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2)))" << iendl; \ 604 598 oss << " " << name_tmp << " = " << name << "_" << iendl; \ 605 oss << " CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", size(" << name << "_,1), size(" << name << "_,2))" << iendl; \599 oss << " CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \ 606 600 } \ 607 else oss << " CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, size(" << name << "_,1), size(" << name << "_,2))" << iendl; \601 else oss << " CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \ 608 602 oss << "ENDIF"; \ 609 603 } \ … … 617 611 if (!matchingTypeCFortran<T>()) \ 618 612 { \ 619 oss << " ALLOCATE(" << name_tmp << "( size(" << name << "_,1), size(" << name << "_,2), size(" << name << "_,3)))" << iendl; \613 oss << " ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2), SIZE(" << name << "_,3)))" << iendl; \ 620 614 oss << " " << name_tmp << " = " << name << "_" << iendl; \ 621 oss << " CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", size(" << name << "_,1), size(" << name << "_,2), size(" << name << "_,3))" << iendl; \615 oss << " CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \ 622 616 } \ 623 else oss << " CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, size(" << name << "_,1), size(" << name << "_,2), size(" << name << "_,3))" << iendl; \617 else oss << " CALL cxios_set_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \ 624 618 oss << "ENDIF"; \ 625 619 } … … 640 634 if (!matchingTypeCFortran<T>()) \ 641 635 { \ 642 oss << " ALLOCATE(" << name_tmp << "( size(" << name << "_,1)))" << iendl; \643 oss << " CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", size(" << name << "_,1))" << iendl; \636 oss << " ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1)))" << iendl; \ 637 oss << " CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \ 644 638 oss << " " << name << "_ = " << name_tmp << iendl; \ 645 639 } \ 646 else oss << " CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, size(" << name << "_,1))" << iendl; \640 else oss << " CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \ 647 641 oss << "ENDIF"; \ 648 642 } \ … … 656 650 if (!matchingTypeCFortran<T>()) \ 657 651 { \ 658 oss << " ALLOCATE(" << name_tmp << "( size(" << name << "_,1), size(" << name << "_,2)))" << iendl; \659 oss << " CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", size(" << name << "_,1), size(" << name << "_,2))" << iendl; \652 oss << " ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2)))" << iendl; \ 653 oss << " CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \ 660 654 oss << " " << name << "_ = " << name_tmp << iendl; \ 661 655 } \ 662 else oss << " CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, size(" << name << "_,1), size(" << name << "_,2))" << iendl; \656 else oss << " CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \ 663 657 oss << "ENDIF"; \ 664 658 } \ … … 672 666 if (!matchingTypeCFortran<T>()) \ 673 667 { \ 674 oss << " ALLOCATE(" << name_tmp << "( size(" << name << "_,1), size(" << name << "_,2), size(" << name << "_,3)))" << iendl; \675 oss << " CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", size(" << name << "_,1), size(" << name << "_,2), size(" << name << "_,3))" << iendl; \668 oss << " ALLOCATE(" << name_tmp << "(SIZE(" << name << "_,1), SIZE(" << name << "_,2), SIZE(" << name << "_,3)))" << iendl; \ 669 oss << " CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name_tmp << ", SHAPE(" << name << "_))" << iendl; \ 676 670 oss << " " << name << "_ = " << name_tmp << iendl; \ 677 671 } \ 678 else oss << " CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, size(" << name << "_,1), size(" << name << "_,2), size(" << name << "_,3))" << iendl; \672 else oss << " CALL cxios_get_" << className << "_" << name << "(" << className << "_hdl%daddr, " << name << "_, SHAPE(" << name << "_))" << iendl; \ 679 673 oss << "ENDIF"; \ 680 674 } -
XIOS/trunk/src/interface/c_attr/icaxis_attr.cpp
r666 r674 67 67 68 68 69 void cxios_set_axis_bounds(axis_Ptr axis_hdl, double* bounds, int extent1, int extent2)70 { 71 CTimer::get("XIOS").resume(); 72 CArray<double,2> tmp(bounds, shape(extent 1, extent2), neverDeleteData);69 void cxios_set_axis_bounds(axis_Ptr axis_hdl, double* bounds, int* extent) 70 { 71 CTimer::get("XIOS").resume(); 72 CArray<double,2> tmp(bounds, shape(extent[0], extent[1]), neverDeleteData); 73 73 axis_hdl->bounds.reference(tmp.copy()); 74 74 CTimer::get("XIOS").suspend(); 75 75 } 76 76 77 void cxios_get_axis_bounds(axis_Ptr axis_hdl, double* bounds, int extent1, int extent2)78 { 79 CTimer::get("XIOS").resume(); 80 CArray<double,2> tmp(bounds, shape(extent 1, extent2), neverDeleteData);77 void cxios_get_axis_bounds(axis_Ptr axis_hdl, double* bounds, int* extent) 78 { 79 CTimer::get("XIOS").resume(); 80 CArray<double,2> tmp(bounds, shape(extent[0], extent[1]), neverDeleteData); 81 81 tmp=axis_hdl->bounds.getInheritedValue(); 82 82 CTimer::get("XIOS").suspend(); … … 115 115 116 116 117 void cxios_set_axis_data_index(axis_Ptr axis_hdl, int* data_index, int extent1)118 { 119 CTimer::get("XIOS").resume(); 120 CArray<int,1> tmp(data_index, shape(extent 1), neverDeleteData);117 void cxios_set_axis_data_index(axis_Ptr axis_hdl, int* data_index, int* extent) 118 { 119 CTimer::get("XIOS").resume(); 120 CArray<int,1> tmp(data_index, shape(extent[0]), neverDeleteData); 121 121 axis_hdl->data_index.reference(tmp.copy()); 122 122 CTimer::get("XIOS").suspend(); 123 123 } 124 124 125 void cxios_get_axis_data_index(axis_Ptr axis_hdl, int* data_index, int extent1)126 { 127 CTimer::get("XIOS").resume(); 128 CArray<int,1> tmp(data_index, shape(extent 1), neverDeleteData);125 void cxios_get_axis_data_index(axis_Ptr axis_hdl, int* data_index, int* extent) 126 { 127 CTimer::get("XIOS").resume(); 128 CArray<int,1> tmp(data_index, shape(extent[0]), neverDeleteData); 129 129 tmp=axis_hdl->data_index.getInheritedValue(); 130 130 CTimer::get("XIOS").suspend(); … … 189 189 190 190 191 void cxios_set_axis_mask(axis_Ptr axis_hdl, bool* mask, int extent1)192 { 193 CTimer::get("XIOS").resume(); 194 CArray<bool,1> tmp(mask, shape(extent 1), neverDeleteData);191 void cxios_set_axis_mask(axis_Ptr axis_hdl, bool* mask, int* extent) 192 { 193 CTimer::get("XIOS").resume(); 194 CArray<bool,1> tmp(mask, shape(extent[0]), neverDeleteData); 195 195 axis_hdl->mask.reference(tmp.copy()); 196 196 CTimer::get("XIOS").suspend(); 197 197 } 198 198 199 void cxios_get_axis_mask(axis_Ptr axis_hdl, bool* mask, int extent1)200 { 201 CTimer::get("XIOS").resume(); 202 CArray<bool,1> tmp(mask, shape(extent 1), neverDeleteData);199 void cxios_get_axis_mask(axis_Ptr axis_hdl, bool* mask, int* extent) 200 { 201 CTimer::get("XIOS").resume(); 202 CArray<bool,1> tmp(mask, shape(extent[0]), neverDeleteData); 203 203 tmp=axis_hdl->mask.getInheritedValue(); 204 204 CTimer::get("XIOS").suspend(); … … 364 364 365 365 366 void cxios_set_axis_value(axis_Ptr axis_hdl, double* value, int extent1)367 { 368 CTimer::get("XIOS").resume(); 369 CArray<double,1> tmp(value, shape(extent 1), neverDeleteData);366 void cxios_set_axis_value(axis_Ptr axis_hdl, double* value, int* extent) 367 { 368 CTimer::get("XIOS").resume(); 369 CArray<double,1> tmp(value, shape(extent[0]), neverDeleteData); 370 370 axis_hdl->value.reference(tmp.copy()); 371 371 CTimer::get("XIOS").suspend(); 372 372 } 373 373 374 void cxios_get_axis_value(axis_Ptr axis_hdl, double* value, int extent1)375 { 376 CTimer::get("XIOS").resume(); 377 CArray<double,1> tmp(value, shape(extent 1), neverDeleteData);374 void cxios_get_axis_value(axis_Ptr axis_hdl, double* value, int* extent) 375 { 376 CTimer::get("XIOS").resume(); 377 CArray<double,1> tmp(value, shape(extent[0]), neverDeleteData); 378 378 tmp=axis_hdl->value.getInheritedValue(); 379 379 CTimer::get("XIOS").suspend(); -
XIOS/trunk/src/interface/c_attr/icaxisgroup_attr.cpp
r666 r674 67 67 68 68 69 void cxios_set_axisgroup_bounds(axisgroup_Ptr axisgroup_hdl, double* bounds, int extent1, int extent2)70 { 71 CTimer::get("XIOS").resume(); 72 CArray<double,2> tmp(bounds, shape(extent 1, extent2), neverDeleteData);69 void cxios_set_axisgroup_bounds(axisgroup_Ptr axisgroup_hdl, double* bounds, int* extent) 70 { 71 CTimer::get("XIOS").resume(); 72 CArray<double,2> tmp(bounds, shape(extent[0], extent[1]), neverDeleteData); 73 73 axisgroup_hdl->bounds.reference(tmp.copy()); 74 74 CTimer::get("XIOS").suspend(); 75 75 } 76 76 77 void cxios_get_axisgroup_bounds(axisgroup_Ptr axisgroup_hdl, double* bounds, int extent1, int extent2)78 { 79 CTimer::get("XIOS").resume(); 80 CArray<double,2> tmp(bounds, shape(extent 1, extent2), neverDeleteData);77 void cxios_get_axisgroup_bounds(axisgroup_Ptr axisgroup_hdl, double* bounds, int* extent) 78 { 79 CTimer::get("XIOS").resume(); 80 CArray<double,2> tmp(bounds, shape(extent[0], extent[1]), neverDeleteData); 81 81 tmp=axisgroup_hdl->bounds.getInheritedValue(); 82 82 CTimer::get("XIOS").suspend(); … … 115 115 116 116 117 void cxios_set_axisgroup_data_index(axisgroup_Ptr axisgroup_hdl, int* data_index, int extent1)118 { 119 CTimer::get("XIOS").resume(); 120 CArray<int,1> tmp(data_index, shape(extent 1), neverDeleteData);117 void cxios_set_axisgroup_data_index(axisgroup_Ptr axisgroup_hdl, int* data_index, int* extent) 118 { 119 CTimer::get("XIOS").resume(); 120 CArray<int,1> tmp(data_index, shape(extent[0]), neverDeleteData); 121 121 axisgroup_hdl->data_index.reference(tmp.copy()); 122 122 CTimer::get("XIOS").suspend(); 123 123 } 124 124 125 void cxios_get_axisgroup_data_index(axisgroup_Ptr axisgroup_hdl, int* data_index, int extent1)126 { 127 CTimer::get("XIOS").resume(); 128 CArray<int,1> tmp(data_index, shape(extent 1), neverDeleteData);125 void cxios_get_axisgroup_data_index(axisgroup_Ptr axisgroup_hdl, int* data_index, int* extent) 126 { 127 CTimer::get("XIOS").resume(); 128 CArray<int,1> tmp(data_index, shape(extent[0]), neverDeleteData); 129 129 tmp=axisgroup_hdl->data_index.getInheritedValue(); 130 130 CTimer::get("XIOS").suspend(); … … 215 215 216 216 217 void cxios_set_axisgroup_mask(axisgroup_Ptr axisgroup_hdl, bool* mask, int extent1)218 { 219 CTimer::get("XIOS").resume(); 220 CArray<bool,1> tmp(mask, shape(extent 1), neverDeleteData);217 void cxios_set_axisgroup_mask(axisgroup_Ptr axisgroup_hdl, bool* mask, int* extent) 218 { 219 CTimer::get("XIOS").resume(); 220 CArray<bool,1> tmp(mask, shape(extent[0]), neverDeleteData); 221 221 axisgroup_hdl->mask.reference(tmp.copy()); 222 222 CTimer::get("XIOS").suspend(); 223 223 } 224 224 225 void cxios_get_axisgroup_mask(axisgroup_Ptr axisgroup_hdl, bool* mask, int extent1)226 { 227 CTimer::get("XIOS").resume(); 228 CArray<bool,1> tmp(mask, shape(extent 1), neverDeleteData);225 void cxios_get_axisgroup_mask(axisgroup_Ptr axisgroup_hdl, bool* mask, int* extent) 226 { 227 CTimer::get("XIOS").resume(); 228 CArray<bool,1> tmp(mask, shape(extent[0]), neverDeleteData); 229 229 tmp=axisgroup_hdl->mask.getInheritedValue(); 230 230 CTimer::get("XIOS").suspend(); … … 390 390 391 391 392 void cxios_set_axisgroup_value(axisgroup_Ptr axisgroup_hdl, double* value, int extent1)393 { 394 CTimer::get("XIOS").resume(); 395 CArray<double,1> tmp(value, shape(extent 1), neverDeleteData);392 void cxios_set_axisgroup_value(axisgroup_Ptr axisgroup_hdl, double* value, int* extent) 393 { 394 CTimer::get("XIOS").resume(); 395 CArray<double,1> tmp(value, shape(extent[0]), neverDeleteData); 396 396 axisgroup_hdl->value.reference(tmp.copy()); 397 397 CTimer::get("XIOS").suspend(); 398 398 } 399 399 400 void cxios_get_axisgroup_value(axisgroup_Ptr axisgroup_hdl, double* value, int extent1)401 { 402 CTimer::get("XIOS").resume(); 403 CArray<double,1> tmp(value, shape(extent 1), neverDeleteData);400 void cxios_get_axisgroup_value(axisgroup_Ptr axisgroup_hdl, double* value, int* extent) 401 { 402 CTimer::get("XIOS").resume(); 403 CArray<double,1> tmp(value, shape(extent[0]), neverDeleteData); 404 404 tmp=axisgroup_hdl->value.getInheritedValue(); 405 405 CTimer::get("XIOS").suspend(); -
XIOS/trunk/src/interface/c_attr/iccalendar_wrapper_attr.cpp
r591 r674 110 110 111 111 112 void cxios_set_calendar_wrapper_month_lengths(calendar_wrapper_Ptr calendar_wrapper_hdl, int* month_lengths, int extent1)113 { 114 CTimer::get("XIOS").resume(); 115 CArray<int,1> tmp(month_lengths, shape(extent 1), neverDeleteData);112 void cxios_set_calendar_wrapper_month_lengths(calendar_wrapper_Ptr calendar_wrapper_hdl, int* month_lengths, int* extent) 113 { 114 CTimer::get("XIOS").resume(); 115 CArray<int,1> tmp(month_lengths, shape(extent[0]), neverDeleteData); 116 116 calendar_wrapper_hdl->month_lengths.reference(tmp.copy()); 117 117 CTimer::get("XIOS").suspend(); 118 118 } 119 119 120 void cxios_get_calendar_wrapper_month_lengths(calendar_wrapper_Ptr calendar_wrapper_hdl, int* month_lengths, int extent1)121 { 122 CTimer::get("XIOS").resume(); 123 CArray<int,1> tmp(month_lengths, shape(extent 1), neverDeleteData);120 void cxios_get_calendar_wrapper_month_lengths(calendar_wrapper_Ptr calendar_wrapper_hdl, int* month_lengths, int* extent) 121 { 122 CTimer::get("XIOS").resume(); 123 CArray<int,1> tmp(month_lengths, shape(extent[0]), neverDeleteData); 124 124 tmp=calendar_wrapper_hdl->month_lengths.getInheritedValue(); 125 125 CTimer::get("XIOS").suspend(); -
XIOS/trunk/src/interface/c_attr/icdomain_attr.cpp
r666 r674 18 18 typedef xios::CDomain* domain_Ptr; 19 19 20 void cxios_set_domain_area(domain_Ptr domain_hdl, double* area, int extent1, int extent2)21 { 22 CTimer::get("XIOS").resume(); 23 CArray<double,2> tmp(area, shape(extent 1, extent2), neverDeleteData);20 void cxios_set_domain_area(domain_Ptr domain_hdl, double* area, int* extent) 21 { 22 CTimer::get("XIOS").resume(); 23 CArray<double,2> tmp(area, shape(extent[0], extent[1]), neverDeleteData); 24 24 domain_hdl->area.reference(tmp.copy()); 25 25 CTimer::get("XIOS").suspend(); 26 26 } 27 27 28 void cxios_get_domain_area(domain_Ptr domain_hdl, double* area, int extent1, int extent2)29 { 30 CTimer::get("XIOS").resume(); 31 CArray<double,2> tmp(area, shape(extent 1, extent2), neverDeleteData);28 void cxios_get_domain_area(domain_Ptr domain_hdl, double* area, int* extent) 29 { 30 CTimer::get("XIOS").resume(); 31 CArray<double,2> tmp(area, shape(extent[0], extent[1]), neverDeleteData); 32 32 tmp=domain_hdl->area.getInheritedValue(); 33 33 CTimer::get("XIOS").suspend(); … … 43 43 44 44 45 void cxios_set_domain_bounds_lat_1d(domain_Ptr domain_hdl, double* bounds_lat_1d, int extent1, int extent2)46 { 47 CTimer::get("XIOS").resume(); 48 CArray<double,2> tmp(bounds_lat_1d, shape(extent 1, extent2), neverDeleteData);45 void cxios_set_domain_bounds_lat_1d(domain_Ptr domain_hdl, double* bounds_lat_1d, int* extent) 46 { 47 CTimer::get("XIOS").resume(); 48 CArray<double,2> tmp(bounds_lat_1d, shape(extent[0], extent[1]), neverDeleteData); 49 49 domain_hdl->bounds_lat_1d.reference(tmp.copy()); 50 50 CTimer::get("XIOS").suspend(); 51 51 } 52 52 53 void cxios_get_domain_bounds_lat_1d(domain_Ptr domain_hdl, double* bounds_lat_1d, int extent1, int extent2)54 { 55 CTimer::get("XIOS").resume(); 56 CArray<double,2> tmp(bounds_lat_1d, shape(extent 1, extent2), neverDeleteData);53 void cxios_get_domain_bounds_lat_1d(domain_Ptr domain_hdl, double* bounds_lat_1d, int* extent) 54 { 55 CTimer::get("XIOS").resume(); 56 CArray<double,2> tmp(bounds_lat_1d, shape(extent[0], extent[1]), neverDeleteData); 57 57 tmp=domain_hdl->bounds_lat_1d.getInheritedValue(); 58 58 CTimer::get("XIOS").suspend(); … … 68 68 69 69 70 void cxios_set_domain_bounds_lat_2d(domain_Ptr domain_hdl, double* bounds_lat_2d, int extent1, int extent2, int extent3)71 { 72 CTimer::get("XIOS").resume(); 73 CArray<double,3> tmp(bounds_lat_2d, shape(extent 1, extent2, extent3), neverDeleteData);70 void cxios_set_domain_bounds_lat_2d(domain_Ptr domain_hdl, double* bounds_lat_2d, int* extent) 71 { 72 CTimer::get("XIOS").resume(); 73 CArray<double,3> tmp(bounds_lat_2d, shape(extent[0], extent[1], extent[2]), neverDeleteData); 74 74 domain_hdl->bounds_lat_2d.reference(tmp.copy()); 75 75 CTimer::get("XIOS").suspend(); 76 76 } 77 77 78 void cxios_get_domain_bounds_lat_2d(domain_Ptr domain_hdl, double* bounds_lat_2d, int extent1, int extent2, int extent3)79 { 80 CTimer::get("XIOS").resume(); 81 CArray<double,3> tmp(bounds_lat_2d, shape(extent 1, extent2, extent3), neverDeleteData);78 void cxios_get_domain_bounds_lat_2d(domain_Ptr domain_hdl, double* bounds_lat_2d, int* extent) 79 { 80 CTimer::get("XIOS").resume(); 81 CArray<double,3> tmp(bounds_lat_2d, shape(extent[0], extent[1], extent[2]), neverDeleteData); 82 82 tmp=domain_hdl->bounds_lat_2d.getInheritedValue(); 83 83 CTimer::get("XIOS").suspend(); … … 93 93 94 94 95 void cxios_set_domain_bounds_lon_1d(domain_Ptr domain_hdl, double* bounds_lon_1d, int extent1, int extent2)96 { 97 CTimer::get("XIOS").resume(); 98 CArray<double,2> tmp(bounds_lon_1d, shape(extent 1, extent2), neverDeleteData);95 void cxios_set_domain_bounds_lon_1d(domain_Ptr domain_hdl, double* bounds_lon_1d, int* extent) 96 { 97 CTimer::get("XIOS").resume(); 98 CArray<double,2> tmp(bounds_lon_1d, shape(extent[0], extent[1]), neverDeleteData); 99 99 domain_hdl->bounds_lon_1d.reference(tmp.copy()); 100 100 CTimer::get("XIOS").suspend(); 101 101 } 102 102 103 void cxios_get_domain_bounds_lon_1d(domain_Ptr domain_hdl, double* bounds_lon_1d, int extent1, int extent2)104 { 105 CTimer::get("XIOS").resume(); 106 CArray<double,2> tmp(bounds_lon_1d, shape(extent 1, extent2), neverDeleteData);103 void cxios_get_domain_bounds_lon_1d(domain_Ptr domain_hdl, double* bounds_lon_1d, int* extent) 104 { 105 CTimer::get("XIOS").resume(); 106 CArray<double,2> tmp(bounds_lon_1d, shape(extent[0], extent[1]), neverDeleteData); 107 107 tmp=domain_hdl->bounds_lon_1d.getInheritedValue(); 108 108 CTimer::get("XIOS").suspend(); … … 118 118 119 119 120 void cxios_set_domain_bounds_lon_2d(domain_Ptr domain_hdl, double* bounds_lon_2d, int extent1, int extent2, int extent3)121 { 122 CTimer::get("XIOS").resume(); 123 CArray<double,3> tmp(bounds_lon_2d, shape(extent 1, extent2, extent3), neverDeleteData);120 void cxios_set_domain_bounds_lon_2d(domain_Ptr domain_hdl, double* bounds_lon_2d, int* extent) 121 { 122 CTimer::get("XIOS").resume(); 123 CArray<double,3> tmp(bounds_lon_2d, shape(extent[0], extent[1], extent[2]), neverDeleteData); 124 124 domain_hdl->bounds_lon_2d.reference(tmp.copy()); 125 125 CTimer::get("XIOS").suspend(); 126 126 } 127 127 128 void cxios_get_domain_bounds_lon_2d(domain_Ptr domain_hdl, double* bounds_lon_2d, int extent1, int extent2, int extent3)129 { 130 CTimer::get("XIOS").resume(); 131 CArray<double,3> tmp(bounds_lon_2d, shape(extent 1, extent2, extent3), neverDeleteData);128 void cxios_get_domain_bounds_lon_2d(domain_Ptr domain_hdl, double* bounds_lon_2d, int* extent) 129 { 130 CTimer::get("XIOS").resume(); 131 CArray<double,3> tmp(bounds_lon_2d, shape(extent[0], extent[1], extent[2]), neverDeleteData); 132 132 tmp=domain_hdl->bounds_lon_2d.getInheritedValue(); 133 133 CTimer::get("XIOS").suspend(); … … 166 166 167 167 168 void cxios_set_domain_data_i_index(domain_Ptr domain_hdl, int* data_i_index, int extent1)169 { 170 CTimer::get("XIOS").resume(); 171 CArray<int,1> tmp(data_i_index, shape(extent 1), neverDeleteData);168 void cxios_set_domain_data_i_index(domain_Ptr domain_hdl, int* data_i_index, int* extent) 169 { 170 CTimer::get("XIOS").resume(); 171 CArray<int,1> tmp(data_i_index, shape(extent[0]), neverDeleteData); 172 172 domain_hdl->data_i_index.reference(tmp.copy()); 173 173 CTimer::get("XIOS").suspend(); 174 174 } 175 175 176 void cxios_get_domain_data_i_index(domain_Ptr domain_hdl, int* data_i_index, int extent1)177 { 178 CTimer::get("XIOS").resume(); 179 CArray<int,1> tmp(data_i_index, shape(extent 1), neverDeleteData);176 void cxios_get_domain_data_i_index(domain_Ptr domain_hdl, int* data_i_index, int* extent) 177 { 178 CTimer::get("XIOS").resume(); 179 CArray<int,1> tmp(data_i_index, shape(extent[0]), neverDeleteData); 180 180 tmp=domain_hdl->data_i_index.getInheritedValue(); 181 181 CTimer::get("XIOS").suspend(); … … 214 214 215 215 216 void cxios_set_domain_data_j_index(domain_Ptr domain_hdl, int* data_j_index, int extent1)217 { 218 CTimer::get("XIOS").resume(); 219 CArray<int,1> tmp(data_j_index, shape(extent 1), neverDeleteData);216 void cxios_set_domain_data_j_index(domain_Ptr domain_hdl, int* data_j_index, int* extent) 217 { 218 CTimer::get("XIOS").resume(); 219 CArray<int,1> tmp(data_j_index, shape(extent[0]), neverDeleteData); 220 220 domain_hdl->data_j_index.reference(tmp.copy()); 221 221 CTimer::get("XIOS").suspend(); 222 222 } 223 223 224 void cxios_get_domain_data_j_index(domain_Ptr domain_hdl, int* data_j_index, int extent1)225 { 226 CTimer::get("XIOS").resume(); 227 CArray<int,1> tmp(data_j_index, shape(extent 1), neverDeleteData);224 void cxios_get_domain_data_j_index(domain_Ptr domain_hdl, int* data_j_index, int* extent) 225 { 226 CTimer::get("XIOS").resume(); 227 CArray<int,1> tmp(data_j_index, shape(extent[0]), neverDeleteData); 228 228 tmp=domain_hdl->data_j_index.getInheritedValue(); 229 229 CTimer::get("XIOS").suspend(); … … 360 360 361 361 362 void cxios_set_domain_i_index(domain_Ptr domain_hdl, int* i_index, int extent1)363 { 364 CTimer::get("XIOS").resume(); 365 CArray<int,1> tmp(i_index, shape(extent 1), neverDeleteData);362 void cxios_set_domain_i_index(domain_Ptr domain_hdl, int* i_index, int* extent) 363 { 364 CTimer::get("XIOS").resume(); 365 CArray<int,1> tmp(i_index, shape(extent[0]), neverDeleteData); 366 366 domain_hdl->i_index.reference(tmp.copy()); 367 367 CTimer::get("XIOS").suspend(); 368 368 } 369 369 370 void cxios_get_domain_i_index(domain_Ptr domain_hdl, int* i_index, int extent1)371 { 372 CTimer::get("XIOS").resume(); 373 CArray<int,1> tmp(i_index, shape(extent 1), neverDeleteData);370 void cxios_get_domain_i_index(domain_Ptr domain_hdl, int* i_index, int* extent) 371 { 372 CTimer::get("XIOS").resume(); 373 CArray<int,1> tmp(i_index, shape(extent[0]), neverDeleteData); 374 374 tmp=domain_hdl->i_index.getInheritedValue(); 375 375 CTimer::get("XIOS").suspend(); … … 408 408 409 409 410 void cxios_set_domain_j_index(domain_Ptr domain_hdl, int* j_index, int extent1)411 { 412 CTimer::get("XIOS").resume(); 413 CArray<int,1> tmp(j_index, shape(extent 1), neverDeleteData);410 void cxios_set_domain_j_index(domain_Ptr domain_hdl, int* j_index, int* extent) 411 { 412 CTimer::get("XIOS").resume(); 413 CArray<int,1> tmp(j_index, shape(extent[0]), neverDeleteData); 414 414 domain_hdl->j_index.reference(tmp.copy()); 415 415 CTimer::get("XIOS").suspend(); 416 416 } 417 417 418 void cxios_get_domain_j_index(domain_Ptr domain_hdl, int* j_index, int extent1)419 { 420 CTimer::get("XIOS").resume(); 421 CArray<int,1> tmp(j_index, shape(extent 1), neverDeleteData);418 void cxios_get_domain_j_index(domain_Ptr domain_hdl, int* j_index, int* extent) 419 { 420 CTimer::get("XIOS").resume(); 421 CArray<int,1> tmp(j_index, shape(extent[0]), neverDeleteData); 422 422 tmp=domain_hdl->j_index.getInheritedValue(); 423 423 CTimer::get("XIOS").suspend(); … … 456 456 457 457 458 void cxios_set_domain_latvalue_1d(domain_Ptr domain_hdl, double* latvalue_1d, int extent1)459 { 460 CTimer::get("XIOS").resume(); 461 CArray<double,1> tmp(latvalue_1d, shape(extent 1), neverDeleteData);458 void cxios_set_domain_latvalue_1d(domain_Ptr domain_hdl, double* latvalue_1d, int* extent) 459 { 460 CTimer::get("XIOS").resume(); 461 CArray<double,1> tmp(latvalue_1d, shape(extent[0]), neverDeleteData); 462 462 domain_hdl->latvalue_1d.reference(tmp.copy()); 463 463 CTimer::get("XIOS").suspend(); 464 464 } 465 465 466 void cxios_get_domain_latvalue_1d(domain_Ptr domain_hdl, double* latvalue_1d, int extent1)467 { 468 CTimer::get("XIOS").resume(); 469 CArray<double,1> tmp(latvalue_1d, shape(extent 1), neverDeleteData);466 void cxios_get_domain_latvalue_1d(domain_Ptr domain_hdl, double* latvalue_1d, int* extent) 467 { 468 CTimer::get("XIOS").resume(); 469 CArray<double,1> tmp(latvalue_1d, shape(extent[0]), neverDeleteData); 470 470 tmp=domain_hdl->latvalue_1d.getInheritedValue(); 471 471 CTimer::get("XIOS").suspend(); … … 481 481 482 482 483 void cxios_set_domain_latvalue_2d(domain_Ptr domain_hdl, double* latvalue_2d, int extent1, int extent2)484 { 485 CTimer::get("XIOS").resume(); 486 CArray<double,2> tmp(latvalue_2d, shape(extent 1, extent2), neverDeleteData);483 void cxios_set_domain_latvalue_2d(domain_Ptr domain_hdl, double* latvalue_2d, int* extent) 484 { 485 CTimer::get("XIOS").resume(); 486 CArray<double,2> tmp(latvalue_2d, shape(extent[0], extent[1]), neverDeleteData); 487 487 domain_hdl->latvalue_2d.reference(tmp.copy()); 488 488 CTimer::get("XIOS").suspend(); 489 489 } 490 490 491 void cxios_get_domain_latvalue_2d(domain_Ptr domain_hdl, double* latvalue_2d, int extent1, int extent2)492 { 493 CTimer::get("XIOS").resume(); 494 CArray<double,2> tmp(latvalue_2d, shape(extent 1, extent2), neverDeleteData);491 void cxios_get_domain_latvalue_2d(domain_Ptr domain_hdl, double* latvalue_2d, int* extent) 492 { 493 CTimer::get("XIOS").resume(); 494 CArray<double,2> tmp(latvalue_2d, shape(extent[0], extent[1]), neverDeleteData); 495 495 tmp=domain_hdl->latvalue_2d.getInheritedValue(); 496 496 CTimer::get("XIOS").suspend(); … … 532 532 533 533 534 void cxios_set_domain_lonvalue_1d(domain_Ptr domain_hdl, double* lonvalue_1d, int extent1)535 { 536 CTimer::get("XIOS").resume(); 537 CArray<double,1> tmp(lonvalue_1d, shape(extent 1), neverDeleteData);534 void cxios_set_domain_lonvalue_1d(domain_Ptr domain_hdl, double* lonvalue_1d, int* extent) 535 { 536 CTimer::get("XIOS").resume(); 537 CArray<double,1> tmp(lonvalue_1d, shape(extent[0]), neverDeleteData); 538 538 domain_hdl->lonvalue_1d.reference(tmp.copy()); 539 539 CTimer::get("XIOS").suspend(); 540 540 } 541 541 542 void cxios_get_domain_lonvalue_1d(domain_Ptr domain_hdl, double* lonvalue_1d, int extent1)543 { 544 CTimer::get("XIOS").resume(); 545 CArray<double,1> tmp(lonvalue_1d, shape(extent 1), neverDeleteData);542 void cxios_get_domain_lonvalue_1d(domain_Ptr domain_hdl, double* lonvalue_1d, int* extent) 543 { 544 CTimer::get("XIOS").resume(); 545 CArray<double,1> tmp(lonvalue_1d, shape(extent[0]), neverDeleteData); 546 546 tmp=domain_hdl->lonvalue_1d.getInheritedValue(); 547 547 CTimer::get("XIOS").suspend(); … … 557 557 558 558 559 void cxios_set_domain_lonvalue_2d(domain_Ptr domain_hdl, double* lonvalue_2d, int extent1, int extent2)560 { 561 CTimer::get("XIOS").resume(); 562 CArray<double,2> tmp(lonvalue_2d, shape(extent 1, extent2), neverDeleteData);559 void cxios_set_domain_lonvalue_2d(domain_Ptr domain_hdl, double* lonvalue_2d, int* extent) 560 { 561 CTimer::get("XIOS").resume(); 562 CArray<double,2> tmp(lonvalue_2d, shape(extent[0], extent[1]), neverDeleteData); 563 563 domain_hdl->lonvalue_2d.reference(tmp.copy()); 564 564 CTimer::get("XIOS").suspend(); 565 565 } 566 566 567 void cxios_get_domain_lonvalue_2d(domain_Ptr domain_hdl, double* lonvalue_2d, int extent1, int extent2)568 { 569 CTimer::get("XIOS").resume(); 570 CArray<double,2> tmp(lonvalue_2d, shape(extent 1, extent2), neverDeleteData);567 void cxios_get_domain_lonvalue_2d(domain_Ptr domain_hdl, double* lonvalue_2d, int* extent) 568 { 569 CTimer::get("XIOS").resume(); 570 CArray<double,2> tmp(lonvalue_2d, shape(extent[0], extent[1]), neverDeleteData); 571 571 tmp=domain_hdl->lonvalue_2d.getInheritedValue(); 572 572 CTimer::get("XIOS").suspend(); … … 582 582 583 583 584 void cxios_set_domain_mask_1d(domain_Ptr domain_hdl, bool* mask_1d, int extent1)585 { 586 CTimer::get("XIOS").resume(); 587 CArray<bool,1> tmp(mask_1d, shape(extent 1), neverDeleteData);584 void cxios_set_domain_mask_1d(domain_Ptr domain_hdl, bool* mask_1d, int* extent) 585 { 586 CTimer::get("XIOS").resume(); 587 CArray<bool,1> tmp(mask_1d, shape(extent[0]), neverDeleteData); 588 588 domain_hdl->mask_1d.reference(tmp.copy()); 589 589 CTimer::get("XIOS").suspend(); 590 590 } 591 591 592 void cxios_get_domain_mask_1d(domain_Ptr domain_hdl, bool* mask_1d, int extent1)593 { 594 CTimer::get("XIOS").resume(); 595 CArray<bool,1> tmp(mask_1d, shape(extent 1), neverDeleteData);592 void cxios_get_domain_mask_1d(domain_Ptr domain_hdl, bool* mask_1d, int* extent) 593 { 594 CTimer::get("XIOS").resume(); 595 CArray<bool,1> tmp(mask_1d, shape(extent[0]), neverDeleteData); 596 596 tmp=domain_hdl->mask_1d.getInheritedValue(); 597 597 CTimer::get("XIOS").suspend(); … … 607 607 608 608 609 void cxios_set_domain_mask_2d(domain_Ptr domain_hdl, bool* mask_2d, int extent1, int extent2)610 { 611 CTimer::get("XIOS").resume(); 612 CArray<bool,2> tmp(mask_2d, shape(extent 1, extent2), neverDeleteData);609 void cxios_set_domain_mask_2d(domain_Ptr domain_hdl, bool* mask_2d, int* extent) 610 { 611 CTimer::get("XIOS").resume(); 612 CArray<bool,2> tmp(mask_2d, shape(extent[0], extent[1]), neverDeleteData); 613 613 domain_hdl->mask_2d.reference(tmp.copy()); 614 614 CTimer::get("XIOS").suspend(); 615 615 } 616 616 617 void cxios_get_domain_mask_2d(domain_Ptr domain_hdl, bool* mask_2d, int extent1, int extent2)618 { 619 CTimer::get("XIOS").resume(); 620 CArray<bool,2> tmp(mask_2d, shape(extent 1, extent2), neverDeleteData);617 void cxios_get_domain_mask_2d(domain_Ptr domain_hdl, bool* mask_2d, int* extent) 618 { 619 CTimer::get("XIOS").resume(); 620 CArray<bool,2> tmp(mask_2d, shape(extent[0], extent[1]), neverDeleteData); 621 621 tmp=domain_hdl->mask_2d.getInheritedValue(); 622 622 CTimer::get("XIOS").suspend(); -
XIOS/trunk/src/interface/c_attr/icdomaingroup_attr.cpp
r666 r674 18 18 typedef xios::CDomainGroup* domaingroup_Ptr; 19 19 20 void cxios_set_domaingroup_area(domaingroup_Ptr domaingroup_hdl, double* area, int extent1, int extent2)21 { 22 CTimer::get("XIOS").resume(); 23 CArray<double,2> tmp(area, shape(extent 1, extent2), neverDeleteData);20 void cxios_set_domaingroup_area(domaingroup_Ptr domaingroup_hdl, double* area, int* extent) 21 { 22 CTimer::get("XIOS").resume(); 23 CArray<double,2> tmp(area, shape(extent[0], extent[1]), neverDeleteData); 24 24 domaingroup_hdl->area.reference(tmp.copy()); 25 25 CTimer::get("XIOS").suspend(); 26 26 } 27 27 28 void cxios_get_domaingroup_area(domaingroup_Ptr domaingroup_hdl, double* area, int extent1, int extent2)29 { 30 CTimer::get("XIOS").resume(); 31 CArray<double,2> tmp(area, shape(extent 1, extent2), neverDeleteData);28 void cxios_get_domaingroup_area(domaingroup_Ptr domaingroup_hdl, double* area, int* extent) 29 { 30 CTimer::get("XIOS").resume(); 31 CArray<double,2> tmp(area, shape(extent[0], extent[1]), neverDeleteData); 32 32 tmp=domaingroup_hdl->area.getInheritedValue(); 33 33 CTimer::get("XIOS").suspend(); … … 43 43 44 44 45 void cxios_set_domaingroup_bounds_lat_1d(domaingroup_Ptr domaingroup_hdl, double* bounds_lat_1d, int extent1, int extent2)46 { 47 CTimer::get("XIOS").resume(); 48 CArray<double,2> tmp(bounds_lat_1d, shape(extent 1, extent2), neverDeleteData);45 void cxios_set_domaingroup_bounds_lat_1d(domaingroup_Ptr domaingroup_hdl, double* bounds_lat_1d, int* extent) 46 { 47 CTimer::get("XIOS").resume(); 48 CArray<double,2> tmp(bounds_lat_1d, shape(extent[0], extent[1]), neverDeleteData); 49 49 domaingroup_hdl->bounds_lat_1d.reference(tmp.copy()); 50 50 CTimer::get("XIOS").suspend(); 51 51 } 52 52 53 void cxios_get_domaingroup_bounds_lat_1d(domaingroup_Ptr domaingroup_hdl, double* bounds_lat_1d, int extent1, int extent2)54 { 55 CTimer::get("XIOS").resume(); 56 CArray<double,2> tmp(bounds_lat_1d, shape(extent 1, extent2), neverDeleteData);53 void cxios_get_domaingroup_bounds_lat_1d(domaingroup_Ptr domaingroup_hdl, double* bounds_lat_1d, int* extent) 54 { 55 CTimer::get("XIOS").resume(); 56 CArray<double,2> tmp(bounds_lat_1d, shape(extent[0], extent[1]), neverDeleteData); 57 57 tmp=domaingroup_hdl->bounds_lat_1d.getInheritedValue(); 58 58 CTimer::get("XIOS").suspend(); … … 68 68 69 69 70 void cxios_set_domaingroup_bounds_lat_2d(domaingroup_Ptr domaingroup_hdl, double* bounds_lat_2d, int extent1, int extent2, int extent3)71 { 72 CTimer::get("XIOS").resume(); 73 CArray<double,3> tmp(bounds_lat_2d, shape(extent 1, extent2, extent3), neverDeleteData);70 void cxios_set_domaingroup_bounds_lat_2d(domaingroup_Ptr domaingroup_hdl, double* bounds_lat_2d, int* extent) 71 { 72 CTimer::get("XIOS").resume(); 73 CArray<double,3> tmp(bounds_lat_2d, shape(extent[0], extent[1], extent[2]), neverDeleteData); 74 74 domaingroup_hdl->bounds_lat_2d.reference(tmp.copy()); 75 75 CTimer::get("XIOS").suspend(); 76 76 } 77 77 78 void cxios_get_domaingroup_bounds_lat_2d(domaingroup_Ptr domaingroup_hdl, double* bounds_lat_2d, int extent1, int extent2, int extent3)79 { 80 CTimer::get("XIOS").resume(); 81 CArray<double,3> tmp(bounds_lat_2d, shape(extent 1, extent2, extent3), neverDeleteData);78 void cxios_get_domaingroup_bounds_lat_2d(domaingroup_Ptr domaingroup_hdl, double* bounds_lat_2d, int* extent) 79 { 80 CTimer::get("XIOS").resume(); 81 CArray<double,3> tmp(bounds_lat_2d, shape(extent[0], extent[1], extent[2]), neverDeleteData); 82 82 tmp=domaingroup_hdl->bounds_lat_2d.getInheritedValue(); 83 83 CTimer::get("XIOS").suspend(); … … 93 93 94 94 95 void cxios_set_domaingroup_bounds_lon_1d(domaingroup_Ptr domaingroup_hdl, double* bounds_lon_1d, int extent1, int extent2)96 { 97 CTimer::get("XIOS").resume(); 98 CArray<double,2> tmp(bounds_lon_1d, shape(extent 1, extent2), neverDeleteData);95 void cxios_set_domaingroup_bounds_lon_1d(domaingroup_Ptr domaingroup_hdl, double* bounds_lon_1d, int* extent) 96 { 97 CTimer::get("XIOS").resume(); 98 CArray<double,2> tmp(bounds_lon_1d, shape(extent[0], extent[1]), neverDeleteData); 99 99 domaingroup_hdl->bounds_lon_1d.reference(tmp.copy()); 100 100 CTimer::get("XIOS").suspend(); 101 101 } 102 102 103 void cxios_get_domaingroup_bounds_lon_1d(domaingroup_Ptr domaingroup_hdl, double* bounds_lon_1d, int extent1, int extent2)104 { 105 CTimer::get("XIOS").resume(); 106 CArray<double,2> tmp(bounds_lon_1d, shape(extent 1, extent2), neverDeleteData);103 void cxios_get_domaingroup_bounds_lon_1d(domaingroup_Ptr domaingroup_hdl, double* bounds_lon_1d, int* extent) 104 { 105 CTimer::get("XIOS").resume(); 106 CArray<double,2> tmp(bounds_lon_1d, shape(extent[0], extent[1]), neverDeleteData); 107 107 tmp=domaingroup_hdl->bounds_lon_1d.getInheritedValue(); 108 108 CTimer::get("XIOS").suspend(); … … 118 118 119 119 120 void cxios_set_domaingroup_bounds_lon_2d(domaingroup_Ptr domaingroup_hdl, double* bounds_lon_2d, int extent1, int extent2, int extent3)121 { 122 CTimer::get("XIOS").resume(); 123 CArray<double,3> tmp(bounds_lon_2d, shape(extent 1, extent2, extent3), neverDeleteData);120 void cxios_set_domaingroup_bounds_lon_2d(domaingroup_Ptr domaingroup_hdl, double* bounds_lon_2d, int* extent) 121 { 122 CTimer::get("XIOS").resume(); 123 CArray<double,3> tmp(bounds_lon_2d, shape(extent[0], extent[1], extent[2]), neverDeleteData); 124 124 domaingroup_hdl->bounds_lon_2d.reference(tmp.copy()); 125 125 CTimer::get("XIOS").suspend(); 126 126 } 127 127 128 void cxios_get_domaingroup_bounds_lon_2d(domaingroup_Ptr domaingroup_hdl, double* bounds_lon_2d, int extent1, int extent2, int extent3)129 { 130 CTimer::get("XIOS").resume(); 131 CArray<double,3> tmp(bounds_lon_2d, shape(extent 1, extent2, extent3), neverDeleteData);128 void cxios_get_domaingroup_bounds_lon_2d(domaingroup_Ptr domaingroup_hdl, double* bounds_lon_2d, int* extent) 129 { 130 CTimer::get("XIOS").resume(); 131 CArray<double,3> tmp(bounds_lon_2d, shape(extent[0], extent[1], extent[2]), neverDeleteData); 132 132 tmp=domaingroup_hdl->bounds_lon_2d.getInheritedValue(); 133 133 CTimer::get("XIOS").suspend(); … … 166 166 167 167 168 void cxios_set_domaingroup_data_i_index(domaingroup_Ptr domaingroup_hdl, int* data_i_index, int extent1)169 { 170 CTimer::get("XIOS").resume(); 171 CArray<int,1> tmp(data_i_index, shape(extent 1), neverDeleteData);168 void cxios_set_domaingroup_data_i_index(domaingroup_Ptr domaingroup_hdl, int* data_i_index, int* extent) 169 { 170 CTimer::get("XIOS").resume(); 171 CArray<int,1> tmp(data_i_index, shape(extent[0]), neverDeleteData); 172 172 domaingroup_hdl->data_i_index.reference(tmp.copy()); 173 173 CTimer::get("XIOS").suspend(); 174 174 } 175 175 176 void cxios_get_domaingroup_data_i_index(domaingroup_Ptr domaingroup_hdl, int* data_i_index, int extent1)177 { 178 CTimer::get("XIOS").resume(); 179 CArray<int,1> tmp(data_i_index, shape(extent 1), neverDeleteData);176 void cxios_get_domaingroup_data_i_index(domaingroup_Ptr domaingroup_hdl, int* data_i_index, int* extent) 177 { 178 CTimer::get("XIOS").resume(); 179 CArray<int,1> tmp(data_i_index, shape(extent[0]), neverDeleteData); 180 180 tmp=domaingroup_hdl->data_i_index.getInheritedValue(); 181 181 CTimer::get("XIOS").suspend(); … … 214 214 215 215 216 void cxios_set_domaingroup_data_j_index(domaingroup_Ptr domaingroup_hdl, int* data_j_index, int extent1)217 { 218 CTimer::get("XIOS").resume(); 219 CArray<int,1> tmp(data_j_index, shape(extent 1), neverDeleteData);216 void cxios_set_domaingroup_data_j_index(domaingroup_Ptr domaingroup_hdl, int* data_j_index, int* extent) 217 { 218 CTimer::get("XIOS").resume(); 219 CArray<int,1> tmp(data_j_index, shape(extent[0]), neverDeleteData); 220 220 domaingroup_hdl->data_j_index.reference(tmp.copy()); 221 221 CTimer::get("XIOS").suspend(); 222 222 } 223 223 224 void cxios_get_domaingroup_data_j_index(domaingroup_Ptr domaingroup_hdl, int* data_j_index, int extent1)225 { 226 CTimer::get("XIOS").resume(); 227 CArray<int,1> tmp(data_j_index, shape(extent 1), neverDeleteData);224 void cxios_get_domaingroup_data_j_index(domaingroup_Ptr domaingroup_hdl, int* data_j_index, int* extent) 225 { 226 CTimer::get("XIOS").resume(); 227 CArray<int,1> tmp(data_j_index, shape(extent[0]), neverDeleteData); 228 228 tmp=domaingroup_hdl->data_j_index.getInheritedValue(); 229 229 CTimer::get("XIOS").suspend(); … … 386 386 387 387 388 void cxios_set_domaingroup_i_index(domaingroup_Ptr domaingroup_hdl, int* i_index, int extent1)389 { 390 CTimer::get("XIOS").resume(); 391 CArray<int,1> tmp(i_index, shape(extent 1), neverDeleteData);388 void cxios_set_domaingroup_i_index(domaingroup_Ptr domaingroup_hdl, int* i_index, int* extent) 389 { 390 CTimer::get("XIOS").resume(); 391 CArray<int,1> tmp(i_index, shape(extent[0]), neverDeleteData); 392 392 domaingroup_hdl->i_index.reference(tmp.copy()); 393 393 CTimer::get("XIOS").suspend(); 394 394 } 395 395 396 void cxios_get_domaingroup_i_index(domaingroup_Ptr domaingroup_hdl, int* i_index, int extent1)397 { 398 CTimer::get("XIOS").resume(); 399 CArray<int,1> tmp(i_index, shape(extent 1), neverDeleteData);396 void cxios_get_domaingroup_i_index(domaingroup_Ptr domaingroup_hdl, int* i_index, int* extent) 397 { 398 CTimer::get("XIOS").resume(); 399 CArray<int,1> tmp(i_index, shape(extent[0]), neverDeleteData); 400 400 tmp=domaingroup_hdl->i_index.getInheritedValue(); 401 401 CTimer::get("XIOS").suspend(); … … 434 434 435 435 436 void cxios_set_domaingroup_j_index(domaingroup_Ptr domaingroup_hdl, int* j_index, int extent1)437 { 438 CTimer::get("XIOS").resume(); 439 CArray<int,1> tmp(j_index, shape(extent 1), neverDeleteData);436 void cxios_set_domaingroup_j_index(domaingroup_Ptr domaingroup_hdl, int* j_index, int* extent) 437 { 438 CTimer::get("XIOS").resume(); 439 CArray<int,1> tmp(j_index, shape(extent[0]), neverDeleteData); 440 440 domaingroup_hdl->j_index.reference(tmp.copy()); 441 441 CTimer::get("XIOS").suspend(); 442 442 } 443 443 444 void cxios_get_domaingroup_j_index(domaingroup_Ptr domaingroup_hdl, int* j_index, int extent1)445 { 446 CTimer::get("XIOS").resume(); 447 CArray<int,1> tmp(j_index, shape(extent 1), neverDeleteData);444 void cxios_get_domaingroup_j_index(domaingroup_Ptr domaingroup_hdl, int* j_index, int* extent) 445 { 446 CTimer::get("XIOS").resume(); 447 CArray<int,1> tmp(j_index, shape(extent[0]), neverDeleteData); 448 448 tmp=domaingroup_hdl->j_index.getInheritedValue(); 449 449 CTimer::get("XIOS").suspend(); … … 482 482 483 483 484 void cxios_set_domaingroup_latvalue_1d(domaingroup_Ptr domaingroup_hdl, double* latvalue_1d, int extent1)485 { 486 CTimer::get("XIOS").resume(); 487 CArray<double,1> tmp(latvalue_1d, shape(extent 1), neverDeleteData);484 void cxios_set_domaingroup_latvalue_1d(domaingroup_Ptr domaingroup_hdl, double* latvalue_1d, int* extent) 485 { 486 CTimer::get("XIOS").resume(); 487 CArray<double,1> tmp(latvalue_1d, shape(extent[0]), neverDeleteData); 488 488 domaingroup_hdl->latvalue_1d.reference(tmp.copy()); 489 489 CTimer::get("XIOS").suspend(); 490 490 } 491 491 492 void cxios_get_domaingroup_latvalue_1d(domaingroup_Ptr domaingroup_hdl, double* latvalue_1d, int extent1)493 { 494 CTimer::get("XIOS").resume(); 495 CArray<double,1> tmp(latvalue_1d, shape(extent 1), neverDeleteData);492 void cxios_get_domaingroup_latvalue_1d(domaingroup_Ptr domaingroup_hdl, double* latvalue_1d, int* extent) 493 { 494 CTimer::get("XIOS").resume(); 495 CArray<double,1> tmp(latvalue_1d, shape(extent[0]), neverDeleteData); 496 496 tmp=domaingroup_hdl->latvalue_1d.getInheritedValue(); 497 497 CTimer::get("XIOS").suspend(); … … 507 507 508 508 509 void cxios_set_domaingroup_latvalue_2d(domaingroup_Ptr domaingroup_hdl, double* latvalue_2d, int extent1, int extent2)510 { 511 CTimer::get("XIOS").resume(); 512 CArray<double,2> tmp(latvalue_2d, shape(extent 1, extent2), neverDeleteData);509 void cxios_set_domaingroup_latvalue_2d(domaingroup_Ptr domaingroup_hdl, double* latvalue_2d, int* extent) 510 { 511 CTimer::get("XIOS").resume(); 512 CArray<double,2> tmp(latvalue_2d, shape(extent[0], extent[1]), neverDeleteData); 513 513 domaingroup_hdl->latvalue_2d.reference(tmp.copy()); 514 514 CTimer::get("XIOS").suspend(); 515 515 } 516 516 517 void cxios_get_domaingroup_latvalue_2d(domaingroup_Ptr domaingroup_hdl, double* latvalue_2d, int extent1, int extent2)518 { 519 CTimer::get("XIOS").resume(); 520 CArray<double,2> tmp(latvalue_2d, shape(extent 1, extent2), neverDeleteData);517 void cxios_get_domaingroup_latvalue_2d(domaingroup_Ptr domaingroup_hdl, double* latvalue_2d, int* extent) 518 { 519 CTimer::get("XIOS").resume(); 520 CArray<double,2> tmp(latvalue_2d, shape(extent[0], extent[1]), neverDeleteData); 521 521 tmp=domaingroup_hdl->latvalue_2d.getInheritedValue(); 522 522 CTimer::get("XIOS").suspend(); … … 558 558 559 559 560 void cxios_set_domaingroup_lonvalue_1d(domaingroup_Ptr domaingroup_hdl, double* lonvalue_1d, int extent1)561 { 562 CTimer::get("XIOS").resume(); 563 CArray<double,1> tmp(lonvalue_1d, shape(extent 1), neverDeleteData);560 void cxios_set_domaingroup_lonvalue_1d(domaingroup_Ptr domaingroup_hdl, double* lonvalue_1d, int* extent) 561 { 562 CTimer::get("XIOS").resume(); 563 CArray<double,1> tmp(lonvalue_1d, shape(extent[0]), neverDeleteData); 564 564 domaingroup_hdl->lonvalue_1d.reference(tmp.copy()); 565 565 CTimer::get("XIOS").suspend(); 566 566 } 567 567 568 void cxios_get_domaingroup_lonvalue_1d(domaingroup_Ptr domaingroup_hdl, double* lonvalue_1d, int extent1)569 { 570 CTimer::get("XIOS").resume(); 571 CArray<double,1> tmp(lonvalue_1d, shape(extent 1), neverDeleteData);568 void cxios_get_domaingroup_lonvalue_1d(domaingroup_Ptr domaingroup_hdl, double* lonvalue_1d, int* extent) 569 { 570 CTimer::get("XIOS").resume(); 571 CArray<double,1> tmp(lonvalue_1d, shape(extent[0]), neverDeleteData); 572 572 tmp=domaingroup_hdl->lonvalue_1d.getInheritedValue(); 573 573 CTimer::get("XIOS").suspend(); … … 583 583 584 584 585 void cxios_set_domaingroup_lonvalue_2d(domaingroup_Ptr domaingroup_hdl, double* lonvalue_2d, int extent1, int extent2)586 { 587 CTimer::get("XIOS").resume(); 588 CArray<double,2> tmp(lonvalue_2d, shape(extent 1, extent2), neverDeleteData);585 void cxios_set_domaingroup_lonvalue_2d(domaingroup_Ptr domaingroup_hdl, double* lonvalue_2d, int* extent) 586 { 587 CTimer::get("XIOS").resume(); 588 CArray<double,2> tmp(lonvalue_2d, shape(extent[0], extent[1]), neverDeleteData); 589 589 domaingroup_hdl->lonvalue_2d.reference(tmp.copy()); 590 590 CTimer::get("XIOS").suspend(); 591 591 } 592 592 593 void cxios_get_domaingroup_lonvalue_2d(domaingroup_Ptr domaingroup_hdl, double* lonvalue_2d, int extent1, int extent2)594 { 595 CTimer::get("XIOS").resume(); 596 CArray<double,2> tmp(lonvalue_2d, shape(extent 1, extent2), neverDeleteData);593 void cxios_get_domaingroup_lonvalue_2d(domaingroup_Ptr domaingroup_hdl, double* lonvalue_2d, int* extent) 594 { 595 CTimer::get("XIOS").resume(); 596 CArray<double,2> tmp(lonvalue_2d, shape(extent[0], extent[1]), neverDeleteData); 597 597 tmp=domaingroup_hdl->lonvalue_2d.getInheritedValue(); 598 598 CTimer::get("XIOS").suspend(); … … 608 608 609 609 610 void cxios_set_domaingroup_mask_1d(domaingroup_Ptr domaingroup_hdl, bool* mask_1d, int extent1)611 { 612 CTimer::get("XIOS").resume(); 613 CArray<bool,1> tmp(mask_1d, shape(extent 1), neverDeleteData);610 void cxios_set_domaingroup_mask_1d(domaingroup_Ptr domaingroup_hdl, bool* mask_1d, int* extent) 611 { 612 CTimer::get("XIOS").resume(); 613 CArray<bool,1> tmp(mask_1d, shape(extent[0]), neverDeleteData); 614 614 domaingroup_hdl->mask_1d.reference(tmp.copy()); 615 615 CTimer::get("XIOS").suspend(); 616 616 } 617 617 618 void cxios_get_domaingroup_mask_1d(domaingroup_Ptr domaingroup_hdl, bool* mask_1d, int extent1)619 { 620 CTimer::get("XIOS").resume(); 621 CArray<bool,1> tmp(mask_1d, shape(extent 1), neverDeleteData);618 void cxios_get_domaingroup_mask_1d(domaingroup_Ptr domaingroup_hdl, bool* mask_1d, int* extent) 619 { 620 CTimer::get("XIOS").resume(); 621 CArray<bool,1> tmp(mask_1d, shape(extent[0]), neverDeleteData); 622 622 tmp=domaingroup_hdl->mask_1d.getInheritedValue(); 623 623 CTimer::get("XIOS").suspend(); … … 633 633 634 634 635 void cxios_set_domaingroup_mask_2d(domaingroup_Ptr domaingroup_hdl, bool* mask_2d, int extent1, int extent2)636 { 637 CTimer::get("XIOS").resume(); 638 CArray<bool,2> tmp(mask_2d, shape(extent 1, extent2), neverDeleteData);635 void cxios_set_domaingroup_mask_2d(domaingroup_Ptr domaingroup_hdl, bool* mask_2d, int* extent) 636 { 637 CTimer::get("XIOS").resume(); 638 CArray<bool,2> tmp(mask_2d, shape(extent[0], extent[1]), neverDeleteData); 639 639 domaingroup_hdl->mask_2d.reference(tmp.copy()); 640 640 CTimer::get("XIOS").suspend(); 641 641 } 642 642 643 void cxios_get_domaingroup_mask_2d(domaingroup_Ptr domaingroup_hdl, bool* mask_2d, int extent1, int extent2)644 { 645 CTimer::get("XIOS").resume(); 646 CArray<bool,2> tmp(mask_2d, shape(extent 1, extent2), neverDeleteData);643 void cxios_get_domaingroup_mask_2d(domaingroup_Ptr domaingroup_hdl, bool* mask_2d, int* extent) 644 { 645 CTimer::get("XIOS").resume(); 646 CArray<bool,2> tmp(mask_2d, shape(extent[0], extent[1]), neverDeleteData); 647 647 tmp=domaingroup_hdl->mask_2d.getInheritedValue(); 648 648 CTimer::get("XIOS").suspend(); -
XIOS/trunk/src/interface/c_attr/icgrid_attr.cpp
r591 r674 18 18 typedef xios::CGrid* grid_Ptr; 19 19 20 void cxios_set_grid_axis_domain_order(grid_Ptr grid_hdl, bool* axis_domain_order, int extent1)20 void cxios_set_grid_axis_domain_order(grid_Ptr grid_hdl, bool* axis_domain_order, int* extent) 21 21 { 22 22 CTimer::get("XIOS").resume(); 23 CArray<bool,1> tmp(axis_domain_order, shape(extent 1), neverDeleteData);23 CArray<bool,1> tmp(axis_domain_order, shape(extent[0]), neverDeleteData); 24 24 grid_hdl->axis_domain_order.reference(tmp.copy()); 25 25 CTimer::get("XIOS").suspend(); 26 26 } 27 27 28 void cxios_get_grid_axis_domain_order(grid_Ptr grid_hdl, bool* axis_domain_order, int extent1)28 void cxios_get_grid_axis_domain_order(grid_Ptr grid_hdl, bool* axis_domain_order, int* extent) 29 29 { 30 30 CTimer::get("XIOS").resume(); 31 CArray<bool,1> tmp(axis_domain_order, shape(extent 1), neverDeleteData);31 CArray<bool,1> tmp(axis_domain_order, shape(extent[0]), neverDeleteData); 32 32 tmp=grid_hdl->axis_domain_order.getInheritedValue(); 33 33 CTimer::get("XIOS").suspend(); … … 69 69 70 70 71 void cxios_set_grid_mask1(grid_Ptr grid_hdl, bool* mask1, int extent1)71 void cxios_set_grid_mask1(grid_Ptr grid_hdl, bool* mask1, int* extent) 72 72 { 73 73 CTimer::get("XIOS").resume(); 74 CArray<bool,1> tmp(mask1, shape(extent 1), neverDeleteData);74 CArray<bool,1> tmp(mask1, shape(extent[0]), neverDeleteData); 75 75 grid_hdl->mask1.reference(tmp.copy()); 76 76 CTimer::get("XIOS").suspend(); 77 77 } 78 78 79 void cxios_get_grid_mask1(grid_Ptr grid_hdl, bool* mask1, int extent1)79 void cxios_get_grid_mask1(grid_Ptr grid_hdl, bool* mask1, int* extent) 80 80 { 81 81 CTimer::get("XIOS").resume(); 82 CArray<bool,1> tmp(mask1, shape(extent 1), neverDeleteData);82 CArray<bool,1> tmp(mask1, shape(extent[0]), neverDeleteData); 83 83 tmp=grid_hdl->mask1.getInheritedValue(); 84 84 CTimer::get("XIOS").suspend(); … … 94 94 95 95 96 void cxios_set_grid_mask2(grid_Ptr grid_hdl, bool* mask2, int extent1, int extent2)96 void cxios_set_grid_mask2(grid_Ptr grid_hdl, bool* mask2, int* extent) 97 97 { 98 98 CTimer::get("XIOS").resume(); 99 CArray<bool,2> tmp(mask2, shape(extent 1, extent2), neverDeleteData);99 CArray<bool,2> tmp(mask2, shape(extent[0], extent[1]), neverDeleteData); 100 100 grid_hdl->mask2.reference(tmp.copy()); 101 101 CTimer::get("XIOS").suspend(); 102 102 } 103 103 104 void cxios_get_grid_mask2(grid_Ptr grid_hdl, bool* mask2, int extent1, int extent2)104 void cxios_get_grid_mask2(grid_Ptr grid_hdl, bool* mask2, int* extent) 105 105 { 106 106 CTimer::get("XIOS").resume(); 107 CArray<bool,2> tmp(mask2, shape(extent 1, extent2), neverDeleteData);107 CArray<bool,2> tmp(mask2, shape(extent[0], extent[1]), neverDeleteData); 108 108 tmp=grid_hdl->mask2.getInheritedValue(); 109 109 CTimer::get("XIOS").suspend(); … … 119 119 120 120 121 void cxios_set_grid_mask3(grid_Ptr grid_hdl, bool* mask3, int extent1, int extent2, int extent3)121 void cxios_set_grid_mask3(grid_Ptr grid_hdl, bool* mask3, int* extent) 122 122 { 123 123 CTimer::get("XIOS").resume(); 124 CArray<bool,3> tmp(mask3, shape(extent 1, extent2, extent3), neverDeleteData);124 CArray<bool,3> tmp(mask3, shape(extent[0], extent[1], extent[2]), neverDeleteData); 125 125 grid_hdl->mask3.reference(tmp.copy()); 126 126 CTimer::get("XIOS").suspend(); 127 127 } 128 128 129 void cxios_get_grid_mask3(grid_Ptr grid_hdl, bool* mask3, int extent1, int extent2, int extent3)129 void cxios_get_grid_mask3(grid_Ptr grid_hdl, bool* mask3, int* extent) 130 130 { 131 131 CTimer::get("XIOS").resume(); 132 CArray<bool,3> tmp(mask3, shape(extent 1, extent2, extent3), neverDeleteData);132 CArray<bool,3> tmp(mask3, shape(extent[0], extent[1], extent[2]), neverDeleteData); 133 133 tmp=grid_hdl->mask3.getInheritedValue(); 134 134 CTimer::get("XIOS").suspend(); -
XIOS/trunk/src/interface/c_attr/icgridgroup_attr.cpp
r591 r674 18 18 typedef xios::CGridGroup* gridgroup_Ptr; 19 19 20 void cxios_set_gridgroup_axis_domain_order(gridgroup_Ptr gridgroup_hdl, bool* axis_domain_order, int extent1)20 void cxios_set_gridgroup_axis_domain_order(gridgroup_Ptr gridgroup_hdl, bool* axis_domain_order, int* extent) 21 21 { 22 22 CTimer::get("XIOS").resume(); 23 CArray<bool,1> tmp(axis_domain_order, shape(extent 1), neverDeleteData);23 CArray<bool,1> tmp(axis_domain_order, shape(extent[0]), neverDeleteData); 24 24 gridgroup_hdl->axis_domain_order.reference(tmp.copy()); 25 25 CTimer::get("XIOS").suspend(); 26 26 } 27 27 28 void cxios_get_gridgroup_axis_domain_order(gridgroup_Ptr gridgroup_hdl, bool* axis_domain_order, int extent1)28 void cxios_get_gridgroup_axis_domain_order(gridgroup_Ptr gridgroup_hdl, bool* axis_domain_order, int* extent) 29 29 { 30 30 CTimer::get("XIOS").resume(); 31 CArray<bool,1> tmp(axis_domain_order, shape(extent 1), neverDeleteData);31 CArray<bool,1> tmp(axis_domain_order, shape(extent[0]), neverDeleteData); 32 32 tmp=gridgroup_hdl->axis_domain_order.getInheritedValue(); 33 33 CTimer::get("XIOS").suspend(); … … 95 95 96 96 97 void cxios_set_gridgroup_mask1(gridgroup_Ptr gridgroup_hdl, bool* mask1, int extent1)97 void cxios_set_gridgroup_mask1(gridgroup_Ptr gridgroup_hdl, bool* mask1, int* extent) 98 98 { 99 99 CTimer::get("XIOS").resume(); 100 CArray<bool,1> tmp(mask1, shape(extent 1), neverDeleteData);100 CArray<bool,1> tmp(mask1, shape(extent[0]), neverDeleteData); 101 101 gridgroup_hdl->mask1.reference(tmp.copy()); 102 102 CTimer::get("XIOS").suspend(); 103 103 } 104 104 105 void cxios_get_gridgroup_mask1(gridgroup_Ptr gridgroup_hdl, bool* mask1, int extent1)105 void cxios_get_gridgroup_mask1(gridgroup_Ptr gridgroup_hdl, bool* mask1, int* extent) 106 106 { 107 107 CTimer::get("XIOS").resume(); 108 CArray<bool,1> tmp(mask1, shape(extent 1), neverDeleteData);108 CArray<bool,1> tmp(mask1, shape(extent[0]), neverDeleteData); 109 109 tmp=gridgroup_hdl->mask1.getInheritedValue(); 110 110 CTimer::get("XIOS").suspend(); … … 120 120 121 121 122 void cxios_set_gridgroup_mask2(gridgroup_Ptr gridgroup_hdl, bool* mask2, int extent1, int extent2)122 void cxios_set_gridgroup_mask2(gridgroup_Ptr gridgroup_hdl, bool* mask2, int* extent) 123 123 { 124 124 CTimer::get("XIOS").resume(); 125 CArray<bool,2> tmp(mask2, shape(extent 1, extent2), neverDeleteData);125 CArray<bool,2> tmp(mask2, shape(extent[0], extent[1]), neverDeleteData); 126 126 gridgroup_hdl->mask2.reference(tmp.copy()); 127 127 CTimer::get("XIOS").suspend(); 128 128 } 129 129 130 void cxios_get_gridgroup_mask2(gridgroup_Ptr gridgroup_hdl, bool* mask2, int extent1, int extent2)130 void cxios_get_gridgroup_mask2(gridgroup_Ptr gridgroup_hdl, bool* mask2, int* extent) 131 131 { 132 132 CTimer::get("XIOS").resume(); 133 CArray<bool,2> tmp(mask2, shape(extent 1, extent2), neverDeleteData);133 CArray<bool,2> tmp(mask2, shape(extent[0], extent[1]), neverDeleteData); 134 134 tmp=gridgroup_hdl->mask2.getInheritedValue(); 135 135 CTimer::get("XIOS").suspend(); … … 145 145 146 146 147 void cxios_set_gridgroup_mask3(gridgroup_Ptr gridgroup_hdl, bool* mask3, int extent1, int extent2, int extent3)147 void cxios_set_gridgroup_mask3(gridgroup_Ptr gridgroup_hdl, bool* mask3, int* extent) 148 148 { 149 149 CTimer::get("XIOS").resume(); 150 CArray<bool,3> tmp(mask3, shape(extent 1, extent2, extent3), neverDeleteData);150 CArray<bool,3> tmp(mask3, shape(extent[0], extent[1], extent[2]), neverDeleteData); 151 151 gridgroup_hdl->mask3.reference(tmp.copy()); 152 152 CTimer::get("XIOS").suspend(); 153 153 } 154 154 155 void cxios_get_gridgroup_mask3(gridgroup_Ptr gridgroup_hdl, bool* mask3, int extent1, int extent2, int extent3)155 void cxios_get_gridgroup_mask3(gridgroup_Ptr gridgroup_hdl, bool* mask3, int* extent) 156 156 { 157 157 CTimer::get("XIOS").resume(); 158 CArray<bool,3> tmp(mask3, shape(extent 1, extent2, extent3), neverDeleteData);158 CArray<bool,3> tmp(mask3, shape(extent[0], extent[1], extent[2]), neverDeleteData); 159 159 tmp=gridgroup_hdl->mask3.getInheritedValue(); 160 160 CTimer::get("XIOS").suspend(); -
XIOS/trunk/src/interface/fortran_attr/axis_interface_attr.F90
r666 r674 50 50 51 51 52 SUBROUTINE cxios_set_axis_bounds(axis_hdl, bounds, extent 1, extent2) BIND(C)52 SUBROUTINE cxios_set_axis_bounds(axis_hdl, bounds, extent) BIND(C) 53 53 USE ISO_C_BINDING 54 54 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 55 55 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: bounds 56 INTEGER (kind = C_INT), VALUE :: extent1 57 INTEGER (kind = C_INT), VALUE :: extent2 56 INTEGER (kind = C_INT), DIMENSION(*) :: extent 58 57 END SUBROUTINE cxios_set_axis_bounds 59 58 60 SUBROUTINE cxios_get_axis_bounds(axis_hdl, bounds, extent 1, extent2) BIND(C)59 SUBROUTINE cxios_get_axis_bounds(axis_hdl, bounds, extent) BIND(C) 61 60 USE ISO_C_BINDING 62 61 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 63 62 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: bounds 64 INTEGER (kind = C_INT), VALUE :: extent1 65 INTEGER (kind = C_INT), VALUE :: extent2 63 INTEGER (kind = C_INT), DIMENSION(*) :: extent 66 64 END SUBROUTINE cxios_get_axis_bounds 67 65 … … 92 90 93 91 94 SUBROUTINE cxios_set_axis_data_index(axis_hdl, data_index, extent 1) BIND(C)92 SUBROUTINE cxios_set_axis_data_index(axis_hdl, data_index, extent) BIND(C) 95 93 USE ISO_C_BINDING 96 94 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 97 95 INTEGER (KIND=C_INT) , DIMENSION(*) :: data_index 98 INTEGER (kind = C_INT), VALUE :: extent196 INTEGER (kind = C_INT), DIMENSION(*) :: extent 99 97 END SUBROUTINE cxios_set_axis_data_index 100 98 101 SUBROUTINE cxios_get_axis_data_index(axis_hdl, data_index, extent 1) BIND(C)99 SUBROUTINE cxios_get_axis_data_index(axis_hdl, data_index, extent) BIND(C) 102 100 USE ISO_C_BINDING 103 101 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 104 102 INTEGER (KIND=C_INT) , DIMENSION(*) :: data_index 105 INTEGER (kind = C_INT), VALUE :: extent1103 INTEGER (kind = C_INT), DIMENSION(*) :: extent 106 104 END SUBROUTINE cxios_get_axis_data_index 107 105 … … 153 151 154 152 155 SUBROUTINE cxios_set_axis_mask(axis_hdl, mask, extent 1) BIND(C)153 SUBROUTINE cxios_set_axis_mask(axis_hdl, mask, extent) BIND(C) 156 154 USE ISO_C_BINDING 157 155 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 158 156 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask 159 INTEGER (kind = C_INT), VALUE :: extent1157 INTEGER (kind = C_INT), DIMENSION(*) :: extent 160 158 END SUBROUTINE cxios_set_axis_mask 161 159 162 SUBROUTINE cxios_get_axis_mask(axis_hdl, mask, extent 1) BIND(C)160 SUBROUTINE cxios_get_axis_mask(axis_hdl, mask, extent) BIND(C) 163 161 USE ISO_C_BINDING 164 162 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 165 163 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask 166 INTEGER (kind = C_INT), VALUE :: extent1164 INTEGER (kind = C_INT), DIMENSION(*) :: extent 167 165 END SUBROUTINE cxios_get_axis_mask 168 166 … … 296 294 297 295 298 SUBROUTINE cxios_set_axis_value(axis_hdl, value, extent 1) BIND(C)296 SUBROUTINE cxios_set_axis_value(axis_hdl, value, extent) BIND(C) 299 297 USE ISO_C_BINDING 300 298 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 301 299 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: value 302 INTEGER (kind = C_INT), VALUE :: extent1300 INTEGER (kind = C_INT), DIMENSION(*) :: extent 303 301 END SUBROUTINE cxios_set_axis_value 304 302 305 SUBROUTINE cxios_get_axis_value(axis_hdl, value, extent 1) BIND(C)303 SUBROUTINE cxios_get_axis_value(axis_hdl, value, extent) BIND(C) 306 304 USE ISO_C_BINDING 307 305 INTEGER (kind = C_INTPTR_T), VALUE :: axis_hdl 308 306 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: value 309 INTEGER (kind = C_INT), VALUE :: extent1307 INTEGER (kind = C_INT), DIMENSION(*) :: extent 310 308 END SUBROUTINE cxios_get_axis_value 311 309 -
XIOS/trunk/src/interface/fortran_attr/axisgroup_interface_attr.F90
r666 r674 50 50 51 51 52 SUBROUTINE cxios_set_axisgroup_bounds(axisgroup_hdl, bounds, extent 1, extent2) BIND(C)52 SUBROUTINE cxios_set_axisgroup_bounds(axisgroup_hdl, bounds, extent) BIND(C) 53 53 USE ISO_C_BINDING 54 54 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 55 55 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: bounds 56 INTEGER (kind = C_INT), VALUE :: extent1 57 INTEGER (kind = C_INT), VALUE :: extent2 56 INTEGER (kind = C_INT), DIMENSION(*) :: extent 58 57 END SUBROUTINE cxios_set_axisgroup_bounds 59 58 60 SUBROUTINE cxios_get_axisgroup_bounds(axisgroup_hdl, bounds, extent 1, extent2) BIND(C)59 SUBROUTINE cxios_get_axisgroup_bounds(axisgroup_hdl, bounds, extent) BIND(C) 61 60 USE ISO_C_BINDING 62 61 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 63 62 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: bounds 64 INTEGER (kind = C_INT), VALUE :: extent1 65 INTEGER (kind = C_INT), VALUE :: extent2 63 INTEGER (kind = C_INT), DIMENSION(*) :: extent 66 64 END SUBROUTINE cxios_get_axisgroup_bounds 67 65 … … 92 90 93 91 94 SUBROUTINE cxios_set_axisgroup_data_index(axisgroup_hdl, data_index, extent 1) BIND(C)92 SUBROUTINE cxios_set_axisgroup_data_index(axisgroup_hdl, data_index, extent) BIND(C) 95 93 USE ISO_C_BINDING 96 94 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 97 95 INTEGER (KIND=C_INT) , DIMENSION(*) :: data_index 98 INTEGER (kind = C_INT), VALUE :: extent196 INTEGER (kind = C_INT), DIMENSION(*) :: extent 99 97 END SUBROUTINE cxios_set_axisgroup_data_index 100 98 101 SUBROUTINE cxios_get_axisgroup_data_index(axisgroup_hdl, data_index, extent 1) BIND(C)99 SUBROUTINE cxios_get_axisgroup_data_index(axisgroup_hdl, data_index, extent) BIND(C) 102 100 USE ISO_C_BINDING 103 101 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 104 102 INTEGER (KIND=C_INT) , DIMENSION(*) :: data_index 105 INTEGER (kind = C_INT), VALUE :: extent1103 INTEGER (kind = C_INT), DIMENSION(*) :: extent 106 104 END SUBROUTINE cxios_get_axisgroup_data_index 107 105 … … 174 172 175 173 176 SUBROUTINE cxios_set_axisgroup_mask(axisgroup_hdl, mask, extent 1) BIND(C)174 SUBROUTINE cxios_set_axisgroup_mask(axisgroup_hdl, mask, extent) BIND(C) 177 175 USE ISO_C_BINDING 178 176 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 179 177 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask 180 INTEGER (kind = C_INT), VALUE :: extent1178 INTEGER (kind = C_INT), DIMENSION(*) :: extent 181 179 END SUBROUTINE cxios_set_axisgroup_mask 182 180 183 SUBROUTINE cxios_get_axisgroup_mask(axisgroup_hdl, mask, extent 1) BIND(C)181 SUBROUTINE cxios_get_axisgroup_mask(axisgroup_hdl, mask, extent) BIND(C) 184 182 USE ISO_C_BINDING 185 183 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 186 184 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask 187 INTEGER (kind = C_INT), VALUE :: extent1185 INTEGER (kind = C_INT), DIMENSION(*) :: extent 188 186 END SUBROUTINE cxios_get_axisgroup_mask 189 187 … … 317 315 318 316 319 SUBROUTINE cxios_set_axisgroup_value(axisgroup_hdl, value, extent 1) BIND(C)317 SUBROUTINE cxios_set_axisgroup_value(axisgroup_hdl, value, extent) BIND(C) 320 318 USE ISO_C_BINDING 321 319 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 322 320 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: value 323 INTEGER (kind = C_INT), VALUE :: extent1321 INTEGER (kind = C_INT), DIMENSION(*) :: extent 324 322 END SUBROUTINE cxios_set_axisgroup_value 325 323 326 SUBROUTINE cxios_get_axisgroup_value(axisgroup_hdl, value, extent 1) BIND(C)324 SUBROUTINE cxios_get_axisgroup_value(axisgroup_hdl, value, extent) BIND(C) 327 325 USE ISO_C_BINDING 328 326 INTEGER (kind = C_INTPTR_T), VALUE :: axisgroup_hdl 329 327 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: value 330 INTEGER (kind = C_INT), VALUE :: extent1328 INTEGER (kind = C_INT), DIMENSION(*) :: extent 331 329 END SUBROUTINE cxios_get_axisgroup_value 332 330 -
XIOS/trunk/src/interface/fortran_attr/calendar_wrapper_interface_attr.F90
r581 r674 86 86 87 87 88 SUBROUTINE cxios_set_calendar_wrapper_month_lengths(calendar_wrapper_hdl, month_lengths, extent 1) BIND(C)88 SUBROUTINE cxios_set_calendar_wrapper_month_lengths(calendar_wrapper_hdl, month_lengths, extent) BIND(C) 89 89 USE ISO_C_BINDING 90 90 INTEGER (kind = C_INTPTR_T), VALUE :: calendar_wrapper_hdl 91 91 INTEGER (KIND=C_INT) , DIMENSION(*) :: month_lengths 92 INTEGER (kind = C_INT), VALUE :: extent192 INTEGER (kind = C_INT), DIMENSION(*) :: extent 93 93 END SUBROUTINE cxios_set_calendar_wrapper_month_lengths 94 94 95 SUBROUTINE cxios_get_calendar_wrapper_month_lengths(calendar_wrapper_hdl, month_lengths, extent 1) BIND(C)95 SUBROUTINE cxios_get_calendar_wrapper_month_lengths(calendar_wrapper_hdl, month_lengths, extent) BIND(C) 96 96 USE ISO_C_BINDING 97 97 INTEGER (kind = C_INTPTR_T), VALUE :: calendar_wrapper_hdl 98 98 INTEGER (KIND=C_INT) , DIMENSION(*) :: month_lengths 99 INTEGER (kind = C_INT), VALUE :: extent199 INTEGER (kind = C_INT), DIMENSION(*) :: extent 100 100 END SUBROUTINE cxios_get_calendar_wrapper_month_lengths 101 101 -
XIOS/trunk/src/interface/fortran_attr/domain_interface_attr.F90
r666 r674 10 10 ! Do not call directly / interface FORTRAN 2003 <-> C99 11 11 12 SUBROUTINE cxios_set_domain_area(domain_hdl, area, extent 1, extent2) BIND(C)12 SUBROUTINE cxios_set_domain_area(domain_hdl, area, extent) BIND(C) 13 13 USE ISO_C_BINDING 14 14 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 15 15 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: area 16 INTEGER (kind = C_INT), VALUE :: extent1 17 INTEGER (kind = C_INT), VALUE :: extent2 16 INTEGER (kind = C_INT), DIMENSION(*) :: extent 18 17 END SUBROUTINE cxios_set_domain_area 19 18 20 SUBROUTINE cxios_get_domain_area(domain_hdl, area, extent 1, extent2) BIND(C)19 SUBROUTINE cxios_get_domain_area(domain_hdl, area, extent) BIND(C) 21 20 USE ISO_C_BINDING 22 21 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 23 22 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: area 24 INTEGER (kind = C_INT), VALUE :: extent1 25 INTEGER (kind = C_INT), VALUE :: extent2 23 INTEGER (kind = C_INT), DIMENSION(*) :: extent 26 24 END SUBROUTINE cxios_get_domain_area 27 25 … … 33 31 34 32 35 SUBROUTINE cxios_set_domain_bounds_lat_1d(domain_hdl, bounds_lat_1d, extent 1, extent2) BIND(C)33 SUBROUTINE cxios_set_domain_bounds_lat_1d(domain_hdl, bounds_lat_1d, extent) BIND(C) 36 34 USE ISO_C_BINDING 37 35 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 38 36 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: bounds_lat_1d 39 INTEGER (kind = C_INT), VALUE :: extent1 40 INTEGER (kind = C_INT), VALUE :: extent2 37 INTEGER (kind = C_INT), DIMENSION(*) :: extent 41 38 END SUBROUTINE cxios_set_domain_bounds_lat_1d 42 39 43 SUBROUTINE cxios_get_domain_bounds_lat_1d(domain_hdl, bounds_lat_1d, extent 1, extent2) BIND(C)40 SUBROUTINE cxios_get_domain_bounds_lat_1d(domain_hdl, bounds_lat_1d, extent) BIND(C) 44 41 USE ISO_C_BINDING 45 42 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 46 43 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: bounds_lat_1d 47 INTEGER (kind = C_INT), VALUE :: extent1 48 INTEGER (kind = C_INT), VALUE :: extent2 44 INTEGER (kind = C_INT), DIMENSION(*) :: extent 49 45 END SUBROUTINE cxios_get_domain_bounds_lat_1d 50 46 … … 56 52 57 53 58 SUBROUTINE cxios_set_domain_bounds_lat_2d(domain_hdl, bounds_lat_2d, extent 1, extent2, extent3) BIND(C)54 SUBROUTINE cxios_set_domain_bounds_lat_2d(domain_hdl, bounds_lat_2d, extent) BIND(C) 59 55 USE ISO_C_BINDING 60 56 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 61 57 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: bounds_lat_2d 62 INTEGER (kind = C_INT), VALUE :: extent1 63 INTEGER (kind = C_INT), VALUE :: extent2 64 INTEGER (kind = C_INT), VALUE :: extent3 58 INTEGER (kind = C_INT), DIMENSION(*) :: extent 65 59 END SUBROUTINE cxios_set_domain_bounds_lat_2d 66 60 67 SUBROUTINE cxios_get_domain_bounds_lat_2d(domain_hdl, bounds_lat_2d, extent 1, extent2, extent3) BIND(C)61 SUBROUTINE cxios_get_domain_bounds_lat_2d(domain_hdl, bounds_lat_2d, extent) BIND(C) 68 62 USE ISO_C_BINDING 69 63 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 70 64 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: bounds_lat_2d 71 INTEGER (kind = C_INT), VALUE :: extent1 72 INTEGER (kind = C_INT), VALUE :: extent2 73 INTEGER (kind = C_INT), VALUE :: extent3 65 INTEGER (kind = C_INT), DIMENSION(*) :: extent 74 66 END SUBROUTINE cxios_get_domain_bounds_lat_2d 75 67 … … 81 73 82 74 83 SUBROUTINE cxios_set_domain_bounds_lon_1d(domain_hdl, bounds_lon_1d, extent 1, extent2) BIND(C)75 SUBROUTINE cxios_set_domain_bounds_lon_1d(domain_hdl, bounds_lon_1d, extent) BIND(C) 84 76 USE ISO_C_BINDING 85 77 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 86 78 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: bounds_lon_1d 87 INTEGER (kind = C_INT), VALUE :: extent1 88 INTEGER (kind = C_INT), VALUE :: extent2 79 INTEGER (kind = C_INT), DIMENSION(*) :: extent 89 80 END SUBROUTINE cxios_set_domain_bounds_lon_1d 90 81 91 SUBROUTINE cxios_get_domain_bounds_lon_1d(domain_hdl, bounds_lon_1d, extent 1, extent2) BIND(C)82 SUBROUTINE cxios_get_domain_bounds_lon_1d(domain_hdl, bounds_lon_1d, extent) BIND(C) 92 83 USE ISO_C_BINDING 93 84 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 94 85 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: bounds_lon_1d 95 INTEGER (kind = C_INT), VALUE :: extent1 96 INTEGER (kind = C_INT), VALUE :: extent2 86 INTEGER (kind = C_INT), DIMENSION(*) :: extent 97 87 END SUBROUTINE cxios_get_domain_bounds_lon_1d 98 88 … … 104 94 105 95 106 SUBROUTINE cxios_set_domain_bounds_lon_2d(domain_hdl, bounds_lon_2d, extent 1, extent2, extent3) BIND(C)96 SUBROUTINE cxios_set_domain_bounds_lon_2d(domain_hdl, bounds_lon_2d, extent) BIND(C) 107 97 USE ISO_C_BINDING 108 98 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 109 99 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: bounds_lon_2d 110 INTEGER (kind = C_INT), VALUE :: extent1 111 INTEGER (kind = C_INT), VALUE :: extent2 112 INTEGER (kind = C_INT), VALUE :: extent3 100 INTEGER (kind = C_INT), DIMENSION(*) :: extent 113 101 END SUBROUTINE cxios_set_domain_bounds_lon_2d 114 102 115 SUBROUTINE cxios_get_domain_bounds_lon_2d(domain_hdl, bounds_lon_2d, extent 1, extent2, extent3) BIND(C)103 SUBROUTINE cxios_get_domain_bounds_lon_2d(domain_hdl, bounds_lon_2d, extent) BIND(C) 116 104 USE ISO_C_BINDING 117 105 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 118 106 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: bounds_lon_2d 119 INTEGER (kind = C_INT), VALUE :: extent1 120 INTEGER (kind = C_INT), VALUE :: extent2 121 INTEGER (kind = C_INT), VALUE :: extent3 107 INTEGER (kind = C_INT), DIMENSION(*) :: extent 122 108 END SUBROUTINE cxios_get_domain_bounds_lon_2d 123 109 … … 148 134 149 135 150 SUBROUTINE cxios_set_domain_data_i_index(domain_hdl, data_i_index, extent 1) BIND(C)136 SUBROUTINE cxios_set_domain_data_i_index(domain_hdl, data_i_index, extent) BIND(C) 151 137 USE ISO_C_BINDING 152 138 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 153 139 INTEGER (KIND=C_INT) , DIMENSION(*) :: data_i_index 154 INTEGER (kind = C_INT), VALUE :: extent1140 INTEGER (kind = C_INT), DIMENSION(*) :: extent 155 141 END SUBROUTINE cxios_set_domain_data_i_index 156 142 157 SUBROUTINE cxios_get_domain_data_i_index(domain_hdl, data_i_index, extent 1) BIND(C)143 SUBROUTINE cxios_get_domain_data_i_index(domain_hdl, data_i_index, extent) BIND(C) 158 144 USE ISO_C_BINDING 159 145 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 160 146 INTEGER (KIND=C_INT) , DIMENSION(*) :: data_i_index 161 INTEGER (kind = C_INT), VALUE :: extent1147 INTEGER (kind = C_INT), DIMENSION(*) :: extent 162 148 END SUBROUTINE cxios_get_domain_data_i_index 163 149 … … 188 174 189 175 190 SUBROUTINE cxios_set_domain_data_j_index(domain_hdl, data_j_index, extent 1) BIND(C)176 SUBROUTINE cxios_set_domain_data_j_index(domain_hdl, data_j_index, extent) BIND(C) 191 177 USE ISO_C_BINDING 192 178 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 193 179 INTEGER (KIND=C_INT) , DIMENSION(*) :: data_j_index 194 INTEGER (kind = C_INT), VALUE :: extent1180 INTEGER (kind = C_INT), DIMENSION(*) :: extent 195 181 END SUBROUTINE cxios_set_domain_data_j_index 196 182 197 SUBROUTINE cxios_get_domain_data_j_index(domain_hdl, data_j_index, extent 1) BIND(C)183 SUBROUTINE cxios_get_domain_data_j_index(domain_hdl, data_j_index, extent) BIND(C) 198 184 USE ISO_C_BINDING 199 185 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 200 186 INTEGER (KIND=C_INT) , DIMENSION(*) :: data_j_index 201 INTEGER (kind = C_INT), VALUE :: extent1187 INTEGER (kind = C_INT), DIMENSION(*) :: extent 202 188 END SUBROUTINE cxios_get_domain_data_j_index 203 189 … … 308 294 309 295 310 SUBROUTINE cxios_set_domain_i_index(domain_hdl, i_index, extent 1) BIND(C)296 SUBROUTINE cxios_set_domain_i_index(domain_hdl, i_index, extent) BIND(C) 311 297 USE ISO_C_BINDING 312 298 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 313 299 INTEGER (KIND=C_INT) , DIMENSION(*) :: i_index 314 INTEGER (kind = C_INT), VALUE :: extent1300 INTEGER (kind = C_INT), DIMENSION(*) :: extent 315 301 END SUBROUTINE cxios_set_domain_i_index 316 302 317 SUBROUTINE cxios_get_domain_i_index(domain_hdl, i_index, extent 1) BIND(C)303 SUBROUTINE cxios_get_domain_i_index(domain_hdl, i_index, extent) BIND(C) 318 304 USE ISO_C_BINDING 319 305 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 320 306 INTEGER (KIND=C_INT) , DIMENSION(*) :: i_index 321 INTEGER (kind = C_INT), VALUE :: extent1307 INTEGER (kind = C_INT), DIMENSION(*) :: extent 322 308 END SUBROUTINE cxios_get_domain_i_index 323 309 … … 348 334 349 335 350 SUBROUTINE cxios_set_domain_j_index(domain_hdl, j_index, extent 1) BIND(C)336 SUBROUTINE cxios_set_domain_j_index(domain_hdl, j_index, extent) BIND(C) 351 337 USE ISO_C_BINDING 352 338 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 353 339 INTEGER (KIND=C_INT) , DIMENSION(*) :: j_index 354 INTEGER (kind = C_INT), VALUE :: extent1340 INTEGER (kind = C_INT), DIMENSION(*) :: extent 355 341 END SUBROUTINE cxios_set_domain_j_index 356 342 357 SUBROUTINE cxios_get_domain_j_index(domain_hdl, j_index, extent 1) BIND(C)343 SUBROUTINE cxios_get_domain_j_index(domain_hdl, j_index, extent) BIND(C) 358 344 USE ISO_C_BINDING 359 345 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 360 346 INTEGER (KIND=C_INT) , DIMENSION(*) :: j_index 361 INTEGER (kind = C_INT), VALUE :: extent1347 INTEGER (kind = C_INT), DIMENSION(*) :: extent 362 348 END SUBROUTINE cxios_get_domain_j_index 363 349 … … 388 374 389 375 390 SUBROUTINE cxios_set_domain_latvalue_1d(domain_hdl, latvalue_1d, extent 1) BIND(C)376 SUBROUTINE cxios_set_domain_latvalue_1d(domain_hdl, latvalue_1d, extent) BIND(C) 391 377 USE ISO_C_BINDING 392 378 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 393 379 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: latvalue_1d 394 INTEGER (kind = C_INT), VALUE :: extent1380 INTEGER (kind = C_INT), DIMENSION(*) :: extent 395 381 END SUBROUTINE cxios_set_domain_latvalue_1d 396 382 397 SUBROUTINE cxios_get_domain_latvalue_1d(domain_hdl, latvalue_1d, extent 1) BIND(C)383 SUBROUTINE cxios_get_domain_latvalue_1d(domain_hdl, latvalue_1d, extent) BIND(C) 398 384 USE ISO_C_BINDING 399 385 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 400 386 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: latvalue_1d 401 INTEGER (kind = C_INT), VALUE :: extent1387 INTEGER (kind = C_INT), DIMENSION(*) :: extent 402 388 END SUBROUTINE cxios_get_domain_latvalue_1d 403 389 … … 409 395 410 396 411 SUBROUTINE cxios_set_domain_latvalue_2d(domain_hdl, latvalue_2d, extent 1, extent2) BIND(C)397 SUBROUTINE cxios_set_domain_latvalue_2d(domain_hdl, latvalue_2d, extent) BIND(C) 412 398 USE ISO_C_BINDING 413 399 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 414 400 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: latvalue_2d 415 INTEGER (kind = C_INT), VALUE :: extent1 416 INTEGER (kind = C_INT), VALUE :: extent2 401 INTEGER (kind = C_INT), DIMENSION(*) :: extent 417 402 END SUBROUTINE cxios_set_domain_latvalue_2d 418 403 419 SUBROUTINE cxios_get_domain_latvalue_2d(domain_hdl, latvalue_2d, extent 1, extent2) BIND(C)404 SUBROUTINE cxios_get_domain_latvalue_2d(domain_hdl, latvalue_2d, extent) BIND(C) 420 405 USE ISO_C_BINDING 421 406 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 422 407 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: latvalue_2d 423 INTEGER (kind = C_INT), VALUE :: extent1 424 INTEGER (kind = C_INT), VALUE :: extent2 408 INTEGER (kind = C_INT), DIMENSION(*) :: extent 425 409 END SUBROUTINE cxios_get_domain_latvalue_2d 426 410 … … 453 437 454 438 455 SUBROUTINE cxios_set_domain_lonvalue_1d(domain_hdl, lonvalue_1d, extent 1) BIND(C)439 SUBROUTINE cxios_set_domain_lonvalue_1d(domain_hdl, lonvalue_1d, extent) BIND(C) 456 440 USE ISO_C_BINDING 457 441 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 458 442 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: lonvalue_1d 459 INTEGER (kind = C_INT), VALUE :: extent1443 INTEGER (kind = C_INT), DIMENSION(*) :: extent 460 444 END SUBROUTINE cxios_set_domain_lonvalue_1d 461 445 462 SUBROUTINE cxios_get_domain_lonvalue_1d(domain_hdl, lonvalue_1d, extent 1) BIND(C)446 SUBROUTINE cxios_get_domain_lonvalue_1d(domain_hdl, lonvalue_1d, extent) BIND(C) 463 447 USE ISO_C_BINDING 464 448 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 465 449 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: lonvalue_1d 466 INTEGER (kind = C_INT), VALUE :: extent1450 INTEGER (kind = C_INT), DIMENSION(*) :: extent 467 451 END SUBROUTINE cxios_get_domain_lonvalue_1d 468 452 … … 474 458 475 459 476 SUBROUTINE cxios_set_domain_lonvalue_2d(domain_hdl, lonvalue_2d, extent 1, extent2) BIND(C)460 SUBROUTINE cxios_set_domain_lonvalue_2d(domain_hdl, lonvalue_2d, extent) BIND(C) 477 461 USE ISO_C_BINDING 478 462 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 479 463 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: lonvalue_2d 480 INTEGER (kind = C_INT), VALUE :: extent1 481 INTEGER (kind = C_INT), VALUE :: extent2 464 INTEGER (kind = C_INT), DIMENSION(*) :: extent 482 465 END SUBROUTINE cxios_set_domain_lonvalue_2d 483 466 484 SUBROUTINE cxios_get_domain_lonvalue_2d(domain_hdl, lonvalue_2d, extent 1, extent2) BIND(C)467 SUBROUTINE cxios_get_domain_lonvalue_2d(domain_hdl, lonvalue_2d, extent) BIND(C) 485 468 USE ISO_C_BINDING 486 469 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 487 470 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: lonvalue_2d 488 INTEGER (kind = C_INT), VALUE :: extent1 489 INTEGER (kind = C_INT), VALUE :: extent2 471 INTEGER (kind = C_INT), DIMENSION(*) :: extent 490 472 END SUBROUTINE cxios_get_domain_lonvalue_2d 491 473 … … 497 479 498 480 499 SUBROUTINE cxios_set_domain_mask_1d(domain_hdl, mask_1d, extent 1) BIND(C)481 SUBROUTINE cxios_set_domain_mask_1d(domain_hdl, mask_1d, extent) BIND(C) 500 482 USE ISO_C_BINDING 501 483 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 502 484 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask_1d 503 INTEGER (kind = C_INT), VALUE :: extent1485 INTEGER (kind = C_INT), DIMENSION(*) :: extent 504 486 END SUBROUTINE cxios_set_domain_mask_1d 505 487 506 SUBROUTINE cxios_get_domain_mask_1d(domain_hdl, mask_1d, extent 1) BIND(C)488 SUBROUTINE cxios_get_domain_mask_1d(domain_hdl, mask_1d, extent) BIND(C) 507 489 USE ISO_C_BINDING 508 490 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 509 491 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask_1d 510 INTEGER (kind = C_INT), VALUE :: extent1492 INTEGER (kind = C_INT), DIMENSION(*) :: extent 511 493 END SUBROUTINE cxios_get_domain_mask_1d 512 494 … … 518 500 519 501 520 SUBROUTINE cxios_set_domain_mask_2d(domain_hdl, mask_2d, extent 1, extent2) BIND(C)502 SUBROUTINE cxios_set_domain_mask_2d(domain_hdl, mask_2d, extent) BIND(C) 521 503 USE ISO_C_BINDING 522 504 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 523 505 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask_2d 524 INTEGER (kind = C_INT), VALUE :: extent1 525 INTEGER (kind = C_INT), VALUE :: extent2 506 INTEGER (kind = C_INT), DIMENSION(*) :: extent 526 507 END SUBROUTINE cxios_set_domain_mask_2d 527 508 528 SUBROUTINE cxios_get_domain_mask_2d(domain_hdl, mask_2d, extent 1, extent2) BIND(C)509 SUBROUTINE cxios_get_domain_mask_2d(domain_hdl, mask_2d, extent) BIND(C) 529 510 USE ISO_C_BINDING 530 511 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 531 512 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask_2d 532 INTEGER (kind = C_INT), VALUE :: extent1 533 INTEGER (kind = C_INT), VALUE :: extent2 513 INTEGER (kind = C_INT), DIMENSION(*) :: extent 534 514 END SUBROUTINE cxios_get_domain_mask_2d 535 515 -
XIOS/trunk/src/interface/fortran_attr/domaingroup_interface_attr.F90
r666 r674 10 10 ! Do not call directly / interface FORTRAN 2003 <-> C99 11 11 12 SUBROUTINE cxios_set_domaingroup_area(domaingroup_hdl, area, extent 1, extent2) BIND(C)12 SUBROUTINE cxios_set_domaingroup_area(domaingroup_hdl, area, extent) BIND(C) 13 13 USE ISO_C_BINDING 14 14 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 15 15 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: area 16 INTEGER (kind = C_INT), VALUE :: extent1 17 INTEGER (kind = C_INT), VALUE :: extent2 16 INTEGER (kind = C_INT), DIMENSION(*) :: extent 18 17 END SUBROUTINE cxios_set_domaingroup_area 19 18 20 SUBROUTINE cxios_get_domaingroup_area(domaingroup_hdl, area, extent 1, extent2) BIND(C)19 SUBROUTINE cxios_get_domaingroup_area(domaingroup_hdl, area, extent) BIND(C) 21 20 USE ISO_C_BINDING 22 21 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 23 22 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: area 24 INTEGER (kind = C_INT), VALUE :: extent1 25 INTEGER (kind = C_INT), VALUE :: extent2 23 INTEGER (kind = C_INT), DIMENSION(*) :: extent 26 24 END SUBROUTINE cxios_get_domaingroup_area 27 25 … … 33 31 34 32 35 SUBROUTINE cxios_set_domaingroup_bounds_lat_1d(domaingroup_hdl, bounds_lat_1d, extent 1, extent2) BIND(C)33 SUBROUTINE cxios_set_domaingroup_bounds_lat_1d(domaingroup_hdl, bounds_lat_1d, extent) BIND(C) 36 34 USE ISO_C_BINDING 37 35 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 38 36 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: bounds_lat_1d 39 INTEGER (kind = C_INT), VALUE :: extent1 40 INTEGER (kind = C_INT), VALUE :: extent2 37 INTEGER (kind = C_INT), DIMENSION(*) :: extent 41 38 END SUBROUTINE cxios_set_domaingroup_bounds_lat_1d 42 39 43 SUBROUTINE cxios_get_domaingroup_bounds_lat_1d(domaingroup_hdl, bounds_lat_1d, extent 1, extent2) BIND(C)40 SUBROUTINE cxios_get_domaingroup_bounds_lat_1d(domaingroup_hdl, bounds_lat_1d, extent) BIND(C) 44 41 USE ISO_C_BINDING 45 42 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 46 43 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: bounds_lat_1d 47 INTEGER (kind = C_INT), VALUE :: extent1 48 INTEGER (kind = C_INT), VALUE :: extent2 44 INTEGER (kind = C_INT), DIMENSION(*) :: extent 49 45 END SUBROUTINE cxios_get_domaingroup_bounds_lat_1d 50 46 … … 56 52 57 53 58 SUBROUTINE cxios_set_domaingroup_bounds_lat_2d(domaingroup_hdl, bounds_lat_2d, extent 1, extent2, extent3) BIND(C)54 SUBROUTINE cxios_set_domaingroup_bounds_lat_2d(domaingroup_hdl, bounds_lat_2d, extent) BIND(C) 59 55 USE ISO_C_BINDING 60 56 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 61 57 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: bounds_lat_2d 62 INTEGER (kind = C_INT), VALUE :: extent1 63 INTEGER (kind = C_INT), VALUE :: extent2 64 INTEGER (kind = C_INT), VALUE :: extent3 58 INTEGER (kind = C_INT), DIMENSION(*) :: extent 65 59 END SUBROUTINE cxios_set_domaingroup_bounds_lat_2d 66 60 67 SUBROUTINE cxios_get_domaingroup_bounds_lat_2d(domaingroup_hdl, bounds_lat_2d, extent 1, extent2, extent3) BIND(C)61 SUBROUTINE cxios_get_domaingroup_bounds_lat_2d(domaingroup_hdl, bounds_lat_2d, extent) BIND(C) 68 62 USE ISO_C_BINDING 69 63 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 70 64 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: bounds_lat_2d 71 INTEGER (kind = C_INT), VALUE :: extent1 72 INTEGER (kind = C_INT), VALUE :: extent2 73 INTEGER (kind = C_INT), VALUE :: extent3 65 INTEGER (kind = C_INT), DIMENSION(*) :: extent 74 66 END SUBROUTINE cxios_get_domaingroup_bounds_lat_2d 75 67 … … 81 73 82 74 83 SUBROUTINE cxios_set_domaingroup_bounds_lon_1d(domaingroup_hdl, bounds_lon_1d, extent 1, extent2) BIND(C)75 SUBROUTINE cxios_set_domaingroup_bounds_lon_1d(domaingroup_hdl, bounds_lon_1d, extent) BIND(C) 84 76 USE ISO_C_BINDING 85 77 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 86 78 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: bounds_lon_1d 87 INTEGER (kind = C_INT), VALUE :: extent1 88 INTEGER (kind = C_INT), VALUE :: extent2 79 INTEGER (kind = C_INT), DIMENSION(*) :: extent 89 80 END SUBROUTINE cxios_set_domaingroup_bounds_lon_1d 90 81 91 SUBROUTINE cxios_get_domaingroup_bounds_lon_1d(domaingroup_hdl, bounds_lon_1d, extent 1, extent2) BIND(C)82 SUBROUTINE cxios_get_domaingroup_bounds_lon_1d(domaingroup_hdl, bounds_lon_1d, extent) BIND(C) 92 83 USE ISO_C_BINDING 93 84 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 94 85 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: bounds_lon_1d 95 INTEGER (kind = C_INT), VALUE :: extent1 96 INTEGER (kind = C_INT), VALUE :: extent2 86 INTEGER (kind = C_INT), DIMENSION(*) :: extent 97 87 END SUBROUTINE cxios_get_domaingroup_bounds_lon_1d 98 88 … … 104 94 105 95 106 SUBROUTINE cxios_set_domaingroup_bounds_lon_2d(domaingroup_hdl, bounds_lon_2d, extent 1, extent2, extent3) BIND(C)96 SUBROUTINE cxios_set_domaingroup_bounds_lon_2d(domaingroup_hdl, bounds_lon_2d, extent) BIND(C) 107 97 USE ISO_C_BINDING 108 98 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 109 99 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: bounds_lon_2d 110 INTEGER (kind = C_INT), VALUE :: extent1 111 INTEGER (kind = C_INT), VALUE :: extent2 112 INTEGER (kind = C_INT), VALUE :: extent3 100 INTEGER (kind = C_INT), DIMENSION(*) :: extent 113 101 END SUBROUTINE cxios_set_domaingroup_bounds_lon_2d 114 102 115 SUBROUTINE cxios_get_domaingroup_bounds_lon_2d(domaingroup_hdl, bounds_lon_2d, extent 1, extent2, extent3) BIND(C)103 SUBROUTINE cxios_get_domaingroup_bounds_lon_2d(domaingroup_hdl, bounds_lon_2d, extent) BIND(C) 116 104 USE ISO_C_BINDING 117 105 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 118 106 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: bounds_lon_2d 119 INTEGER (kind = C_INT), VALUE :: extent1 120 INTEGER (kind = C_INT), VALUE :: extent2 121 INTEGER (kind = C_INT), VALUE :: extent3 107 INTEGER (kind = C_INT), DIMENSION(*) :: extent 122 108 END SUBROUTINE cxios_get_domaingroup_bounds_lon_2d 123 109 … … 148 134 149 135 150 SUBROUTINE cxios_set_domaingroup_data_i_index(domaingroup_hdl, data_i_index, extent 1) BIND(C)136 SUBROUTINE cxios_set_domaingroup_data_i_index(domaingroup_hdl, data_i_index, extent) BIND(C) 151 137 USE ISO_C_BINDING 152 138 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 153 139 INTEGER (KIND=C_INT) , DIMENSION(*) :: data_i_index 154 INTEGER (kind = C_INT), VALUE :: extent1140 INTEGER (kind = C_INT), DIMENSION(*) :: extent 155 141 END SUBROUTINE cxios_set_domaingroup_data_i_index 156 142 157 SUBROUTINE cxios_get_domaingroup_data_i_index(domaingroup_hdl, data_i_index, extent 1) BIND(C)143 SUBROUTINE cxios_get_domaingroup_data_i_index(domaingroup_hdl, data_i_index, extent) BIND(C) 158 144 USE ISO_C_BINDING 159 145 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 160 146 INTEGER (KIND=C_INT) , DIMENSION(*) :: data_i_index 161 INTEGER (kind = C_INT), VALUE :: extent1147 INTEGER (kind = C_INT), DIMENSION(*) :: extent 162 148 END SUBROUTINE cxios_get_domaingroup_data_i_index 163 149 … … 188 174 189 175 190 SUBROUTINE cxios_set_domaingroup_data_j_index(domaingroup_hdl, data_j_index, extent 1) BIND(C)176 SUBROUTINE cxios_set_domaingroup_data_j_index(domaingroup_hdl, data_j_index, extent) BIND(C) 191 177 USE ISO_C_BINDING 192 178 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 193 179 INTEGER (KIND=C_INT) , DIMENSION(*) :: data_j_index 194 INTEGER (kind = C_INT), VALUE :: extent1180 INTEGER (kind = C_INT), DIMENSION(*) :: extent 195 181 END SUBROUTINE cxios_set_domaingroup_data_j_index 196 182 197 SUBROUTINE cxios_get_domaingroup_data_j_index(domaingroup_hdl, data_j_index, extent 1) BIND(C)183 SUBROUTINE cxios_get_domaingroup_data_j_index(domaingroup_hdl, data_j_index, extent) BIND(C) 198 184 USE ISO_C_BINDING 199 185 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 200 186 INTEGER (KIND=C_INT) , DIMENSION(*) :: data_j_index 201 INTEGER (kind = C_INT), VALUE :: extent1187 INTEGER (kind = C_INT), DIMENSION(*) :: extent 202 188 END SUBROUTINE cxios_get_domaingroup_data_j_index 203 189 … … 329 315 330 316 331 SUBROUTINE cxios_set_domaingroup_i_index(domaingroup_hdl, i_index, extent 1) BIND(C)317 SUBROUTINE cxios_set_domaingroup_i_index(domaingroup_hdl, i_index, extent) BIND(C) 332 318 USE ISO_C_BINDING 333 319 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 334 320 INTEGER (KIND=C_INT) , DIMENSION(*) :: i_index 335 INTEGER (kind = C_INT), VALUE :: extent1321 INTEGER (kind = C_INT), DIMENSION(*) :: extent 336 322 END SUBROUTINE cxios_set_domaingroup_i_index 337 323 338 SUBROUTINE cxios_get_domaingroup_i_index(domaingroup_hdl, i_index, extent 1) BIND(C)324 SUBROUTINE cxios_get_domaingroup_i_index(domaingroup_hdl, i_index, extent) BIND(C) 339 325 USE ISO_C_BINDING 340 326 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 341 327 INTEGER (KIND=C_INT) , DIMENSION(*) :: i_index 342 INTEGER (kind = C_INT), VALUE :: extent1328 INTEGER (kind = C_INT), DIMENSION(*) :: extent 343 329 END SUBROUTINE cxios_get_domaingroup_i_index 344 330 … … 369 355 370 356 371 SUBROUTINE cxios_set_domaingroup_j_index(domaingroup_hdl, j_index, extent 1) BIND(C)357 SUBROUTINE cxios_set_domaingroup_j_index(domaingroup_hdl, j_index, extent) BIND(C) 372 358 USE ISO_C_BINDING 373 359 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 374 360 INTEGER (KIND=C_INT) , DIMENSION(*) :: j_index 375 INTEGER (kind = C_INT), VALUE :: extent1361 INTEGER (kind = C_INT), DIMENSION(*) :: extent 376 362 END SUBROUTINE cxios_set_domaingroup_j_index 377 363 378 SUBROUTINE cxios_get_domaingroup_j_index(domaingroup_hdl, j_index, extent 1) BIND(C)364 SUBROUTINE cxios_get_domaingroup_j_index(domaingroup_hdl, j_index, extent) BIND(C) 379 365 USE ISO_C_BINDING 380 366 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 381 367 INTEGER (KIND=C_INT) , DIMENSION(*) :: j_index 382 INTEGER (kind = C_INT), VALUE :: extent1368 INTEGER (kind = C_INT), DIMENSION(*) :: extent 383 369 END SUBROUTINE cxios_get_domaingroup_j_index 384 370 … … 409 395 410 396 411 SUBROUTINE cxios_set_domaingroup_latvalue_1d(domaingroup_hdl, latvalue_1d, extent 1) BIND(C)397 SUBROUTINE cxios_set_domaingroup_latvalue_1d(domaingroup_hdl, latvalue_1d, extent) BIND(C) 412 398 USE ISO_C_BINDING 413 399 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 414 400 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: latvalue_1d 415 INTEGER (kind = C_INT), VALUE :: extent1401 INTEGER (kind = C_INT), DIMENSION(*) :: extent 416 402 END SUBROUTINE cxios_set_domaingroup_latvalue_1d 417 403 418 SUBROUTINE cxios_get_domaingroup_latvalue_1d(domaingroup_hdl, latvalue_1d, extent 1) BIND(C)404 SUBROUTINE cxios_get_domaingroup_latvalue_1d(domaingroup_hdl, latvalue_1d, extent) BIND(C) 419 405 USE ISO_C_BINDING 420 406 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 421 407 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: latvalue_1d 422 INTEGER (kind = C_INT), VALUE :: extent1408 INTEGER (kind = C_INT), DIMENSION(*) :: extent 423 409 END SUBROUTINE cxios_get_domaingroup_latvalue_1d 424 410 … … 430 416 431 417 432 SUBROUTINE cxios_set_domaingroup_latvalue_2d(domaingroup_hdl, latvalue_2d, extent 1, extent2) BIND(C)418 SUBROUTINE cxios_set_domaingroup_latvalue_2d(domaingroup_hdl, latvalue_2d, extent) BIND(C) 433 419 USE ISO_C_BINDING 434 420 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 435 421 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: latvalue_2d 436 INTEGER (kind = C_INT), VALUE :: extent1 437 INTEGER (kind = C_INT), VALUE :: extent2 422 INTEGER (kind = C_INT), DIMENSION(*) :: extent 438 423 END SUBROUTINE cxios_set_domaingroup_latvalue_2d 439 424 440 SUBROUTINE cxios_get_domaingroup_latvalue_2d(domaingroup_hdl, latvalue_2d, extent 1, extent2) BIND(C)425 SUBROUTINE cxios_get_domaingroup_latvalue_2d(domaingroup_hdl, latvalue_2d, extent) BIND(C) 441 426 USE ISO_C_BINDING 442 427 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 443 428 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: latvalue_2d 444 INTEGER (kind = C_INT), VALUE :: extent1 445 INTEGER (kind = C_INT), VALUE :: extent2 429 INTEGER (kind = C_INT), DIMENSION(*) :: extent 446 430 END SUBROUTINE cxios_get_domaingroup_latvalue_2d 447 431 … … 474 458 475 459 476 SUBROUTINE cxios_set_domaingroup_lonvalue_1d(domaingroup_hdl, lonvalue_1d, extent 1) BIND(C)460 SUBROUTINE cxios_set_domaingroup_lonvalue_1d(domaingroup_hdl, lonvalue_1d, extent) BIND(C) 477 461 USE ISO_C_BINDING 478 462 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 479 463 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: lonvalue_1d 480 INTEGER (kind = C_INT), VALUE :: extent1464 INTEGER (kind = C_INT), DIMENSION(*) :: extent 481 465 END SUBROUTINE cxios_set_domaingroup_lonvalue_1d 482 466 483 SUBROUTINE cxios_get_domaingroup_lonvalue_1d(domaingroup_hdl, lonvalue_1d, extent 1) BIND(C)467 SUBROUTINE cxios_get_domaingroup_lonvalue_1d(domaingroup_hdl, lonvalue_1d, extent) BIND(C) 484 468 USE ISO_C_BINDING 485 469 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 486 470 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: lonvalue_1d 487 INTEGER (kind = C_INT), VALUE :: extent1471 INTEGER (kind = C_INT), DIMENSION(*) :: extent 488 472 END SUBROUTINE cxios_get_domaingroup_lonvalue_1d 489 473 … … 495 479 496 480 497 SUBROUTINE cxios_set_domaingroup_lonvalue_2d(domaingroup_hdl, lonvalue_2d, extent 1, extent2) BIND(C)481 SUBROUTINE cxios_set_domaingroup_lonvalue_2d(domaingroup_hdl, lonvalue_2d, extent) BIND(C) 498 482 USE ISO_C_BINDING 499 483 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 500 484 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: lonvalue_2d 501 INTEGER (kind = C_INT), VALUE :: extent1 502 INTEGER (kind = C_INT), VALUE :: extent2 485 INTEGER (kind = C_INT), DIMENSION(*) :: extent 503 486 END SUBROUTINE cxios_set_domaingroup_lonvalue_2d 504 487 505 SUBROUTINE cxios_get_domaingroup_lonvalue_2d(domaingroup_hdl, lonvalue_2d, extent 1, extent2) BIND(C)488 SUBROUTINE cxios_get_domaingroup_lonvalue_2d(domaingroup_hdl, lonvalue_2d, extent) BIND(C) 506 489 USE ISO_C_BINDING 507 490 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 508 491 REAL (KIND=C_DOUBLE) , DIMENSION(*) :: lonvalue_2d 509 INTEGER (kind = C_INT), VALUE :: extent1 510 INTEGER (kind = C_INT), VALUE :: extent2 492 INTEGER (kind = C_INT), DIMENSION(*) :: extent 511 493 END SUBROUTINE cxios_get_domaingroup_lonvalue_2d 512 494 … … 518 500 519 501 520 SUBROUTINE cxios_set_domaingroup_mask_1d(domaingroup_hdl, mask_1d, extent 1) BIND(C)502 SUBROUTINE cxios_set_domaingroup_mask_1d(domaingroup_hdl, mask_1d, extent) BIND(C) 521 503 USE ISO_C_BINDING 522 504 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 523 505 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask_1d 524 INTEGER (kind = C_INT), VALUE :: extent1506 INTEGER (kind = C_INT), DIMENSION(*) :: extent 525 507 END SUBROUTINE cxios_set_domaingroup_mask_1d 526 508 527 SUBROUTINE cxios_get_domaingroup_mask_1d(domaingroup_hdl, mask_1d, extent 1) BIND(C)509 SUBROUTINE cxios_get_domaingroup_mask_1d(domaingroup_hdl, mask_1d, extent) BIND(C) 528 510 USE ISO_C_BINDING 529 511 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 530 512 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask_1d 531 INTEGER (kind = C_INT), VALUE :: extent1513 INTEGER (kind = C_INT), DIMENSION(*) :: extent 532 514 END SUBROUTINE cxios_get_domaingroup_mask_1d 533 515 … … 539 521 540 522 541 SUBROUTINE cxios_set_domaingroup_mask_2d(domaingroup_hdl, mask_2d, extent 1, extent2) BIND(C)523 SUBROUTINE cxios_set_domaingroup_mask_2d(domaingroup_hdl, mask_2d, extent) BIND(C) 542 524 USE ISO_C_BINDING 543 525 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 544 526 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask_2d 545 INTEGER (kind = C_INT), VALUE :: extent1 546 INTEGER (kind = C_INT), VALUE :: extent2 527 INTEGER (kind = C_INT), DIMENSION(*) :: extent 547 528 END SUBROUTINE cxios_set_domaingroup_mask_2d 548 529 549 SUBROUTINE cxios_get_domaingroup_mask_2d(domaingroup_hdl, mask_2d, extent 1, extent2) BIND(C)530 SUBROUTINE cxios_get_domaingroup_mask_2d(domaingroup_hdl, mask_2d, extent) BIND(C) 550 531 USE ISO_C_BINDING 551 532 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 552 533 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask_2d 553 INTEGER (kind = C_INT), VALUE :: extent1 554 INTEGER (kind = C_INT), VALUE :: extent2 534 INTEGER (kind = C_INT), DIMENSION(*) :: extent 555 535 END SUBROUTINE cxios_get_domaingroup_mask_2d 556 536 -
XIOS/trunk/src/interface/fortran_attr/grid_interface_attr.F90
r581 r674 10 10 ! Do not call directly / interface FORTRAN 2003 <-> C99 11 11 12 SUBROUTINE cxios_set_grid_axis_domain_order(grid_hdl, axis_domain_order, extent 1) BIND(C)12 SUBROUTINE cxios_set_grid_axis_domain_order(grid_hdl, axis_domain_order, extent) BIND(C) 13 13 USE ISO_C_BINDING 14 14 INTEGER (kind = C_INTPTR_T), VALUE :: grid_hdl 15 15 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: axis_domain_order 16 INTEGER (kind = C_INT), VALUE :: extent116 INTEGER (kind = C_INT), DIMENSION(*) :: extent 17 17 END SUBROUTINE cxios_set_grid_axis_domain_order 18 18 19 SUBROUTINE cxios_get_grid_axis_domain_order(grid_hdl, axis_domain_order, extent 1) BIND(C)19 SUBROUTINE cxios_get_grid_axis_domain_order(grid_hdl, axis_domain_order, extent) BIND(C) 20 20 USE ISO_C_BINDING 21 21 INTEGER (kind = C_INTPTR_T), VALUE :: grid_hdl 22 22 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: axis_domain_order 23 INTEGER (kind = C_INT), VALUE :: extent123 INTEGER (kind = C_INT), DIMENSION(*) :: extent 24 24 END SUBROUTINE cxios_get_grid_axis_domain_order 25 25 … … 52 52 53 53 54 SUBROUTINE cxios_set_grid_mask1(grid_hdl, mask1, extent 1) BIND(C)54 SUBROUTINE cxios_set_grid_mask1(grid_hdl, mask1, extent) BIND(C) 55 55 USE ISO_C_BINDING 56 56 INTEGER (kind = C_INTPTR_T), VALUE :: grid_hdl 57 57 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask1 58 INTEGER (kind = C_INT), VALUE :: extent158 INTEGER (kind = C_INT), DIMENSION(*) :: extent 59 59 END SUBROUTINE cxios_set_grid_mask1 60 60 61 SUBROUTINE cxios_get_grid_mask1(grid_hdl, mask1, extent 1) BIND(C)61 SUBROUTINE cxios_get_grid_mask1(grid_hdl, mask1, extent) BIND(C) 62 62 USE ISO_C_BINDING 63 63 INTEGER (kind = C_INTPTR_T), VALUE :: grid_hdl 64 64 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask1 65 INTEGER (kind = C_INT), VALUE :: extent165 INTEGER (kind = C_INT), DIMENSION(*) :: extent 66 66 END SUBROUTINE cxios_get_grid_mask1 67 67 … … 73 73 74 74 75 SUBROUTINE cxios_set_grid_mask2(grid_hdl, mask2, extent 1, extent2) BIND(C)75 SUBROUTINE cxios_set_grid_mask2(grid_hdl, mask2, extent) BIND(C) 76 76 USE ISO_C_BINDING 77 77 INTEGER (kind = C_INTPTR_T), VALUE :: grid_hdl 78 78 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask2 79 INTEGER (kind = C_INT), VALUE :: extent1 80 INTEGER (kind = C_INT), VALUE :: extent2 79 INTEGER (kind = C_INT), DIMENSION(*) :: extent 81 80 END SUBROUTINE cxios_set_grid_mask2 82 81 83 SUBROUTINE cxios_get_grid_mask2(grid_hdl, mask2, extent 1, extent2) BIND(C)82 SUBROUTINE cxios_get_grid_mask2(grid_hdl, mask2, extent) BIND(C) 84 83 USE ISO_C_BINDING 85 84 INTEGER (kind = C_INTPTR_T), VALUE :: grid_hdl 86 85 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask2 87 INTEGER (kind = C_INT), VALUE :: extent1 88 INTEGER (kind = C_INT), VALUE :: extent2 86 INTEGER (kind = C_INT), DIMENSION(*) :: extent 89 87 END SUBROUTINE cxios_get_grid_mask2 90 88 … … 96 94 97 95 98 SUBROUTINE cxios_set_grid_mask3(grid_hdl, mask3, extent 1, extent2, extent3) BIND(C)96 SUBROUTINE cxios_set_grid_mask3(grid_hdl, mask3, extent) BIND(C) 99 97 USE ISO_C_BINDING 100 98 INTEGER (kind = C_INTPTR_T), VALUE :: grid_hdl 101 99 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask3 102 INTEGER (kind = C_INT), VALUE :: extent1 103 INTEGER (kind = C_INT), VALUE :: extent2 104 INTEGER (kind = C_INT), VALUE :: extent3 100 INTEGER (kind = C_INT), DIMENSION(*) :: extent 105 101 END SUBROUTINE cxios_set_grid_mask3 106 102 107 SUBROUTINE cxios_get_grid_mask3(grid_hdl, mask3, extent 1, extent2, extent3) BIND(C)103 SUBROUTINE cxios_get_grid_mask3(grid_hdl, mask3, extent) BIND(C) 108 104 USE ISO_C_BINDING 109 105 INTEGER (kind = C_INTPTR_T), VALUE :: grid_hdl 110 106 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask3 111 INTEGER (kind = C_INT), VALUE :: extent1 112 INTEGER (kind = C_INT), VALUE :: extent2 113 INTEGER (kind = C_INT), VALUE :: extent3 107 INTEGER (kind = C_INT), DIMENSION(*) :: extent 114 108 END SUBROUTINE cxios_get_grid_mask3 115 109 -
XIOS/trunk/src/interface/fortran_attr/gridgroup_interface_attr.F90
r581 r674 10 10 ! Do not call directly / interface FORTRAN 2003 <-> C99 11 11 12 SUBROUTINE cxios_set_gridgroup_axis_domain_order(gridgroup_hdl, axis_domain_order, extent 1) BIND(C)12 SUBROUTINE cxios_set_gridgroup_axis_domain_order(gridgroup_hdl, axis_domain_order, extent) BIND(C) 13 13 USE ISO_C_BINDING 14 14 INTEGER (kind = C_INTPTR_T), VALUE :: gridgroup_hdl 15 15 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: axis_domain_order 16 INTEGER (kind = C_INT), VALUE :: extent116 INTEGER (kind = C_INT), DIMENSION(*) :: extent 17 17 END SUBROUTINE cxios_set_gridgroup_axis_domain_order 18 18 19 SUBROUTINE cxios_get_gridgroup_axis_domain_order(gridgroup_hdl, axis_domain_order, extent 1) BIND(C)19 SUBROUTINE cxios_get_gridgroup_axis_domain_order(gridgroup_hdl, axis_domain_order, extent) BIND(C) 20 20 USE ISO_C_BINDING 21 21 INTEGER (kind = C_INTPTR_T), VALUE :: gridgroup_hdl 22 22 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: axis_domain_order 23 INTEGER (kind = C_INT), VALUE :: extent123 INTEGER (kind = C_INT), DIMENSION(*) :: extent 24 24 END SUBROUTINE cxios_get_gridgroup_axis_domain_order 25 25 … … 73 73 74 74 75 SUBROUTINE cxios_set_gridgroup_mask1(gridgroup_hdl, mask1, extent 1) BIND(C)75 SUBROUTINE cxios_set_gridgroup_mask1(gridgroup_hdl, mask1, extent) BIND(C) 76 76 USE ISO_C_BINDING 77 77 INTEGER (kind = C_INTPTR_T), VALUE :: gridgroup_hdl 78 78 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask1 79 INTEGER (kind = C_INT), VALUE :: extent179 INTEGER (kind = C_INT), DIMENSION(*) :: extent 80 80 END SUBROUTINE cxios_set_gridgroup_mask1 81 81 82 SUBROUTINE cxios_get_gridgroup_mask1(gridgroup_hdl, mask1, extent 1) BIND(C)82 SUBROUTINE cxios_get_gridgroup_mask1(gridgroup_hdl, mask1, extent) BIND(C) 83 83 USE ISO_C_BINDING 84 84 INTEGER (kind = C_INTPTR_T), VALUE :: gridgroup_hdl 85 85 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask1 86 INTEGER (kind = C_INT), VALUE :: extent186 INTEGER (kind = C_INT), DIMENSION(*) :: extent 87 87 END SUBROUTINE cxios_get_gridgroup_mask1 88 88 … … 94 94 95 95 96 SUBROUTINE cxios_set_gridgroup_mask2(gridgroup_hdl, mask2, extent 1, extent2) BIND(C)96 SUBROUTINE cxios_set_gridgroup_mask2(gridgroup_hdl, mask2, extent) BIND(C) 97 97 USE ISO_C_BINDING 98 98 INTEGER (kind = C_INTPTR_T), VALUE :: gridgroup_hdl 99 99 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask2 100 INTEGER (kind = C_INT), VALUE :: extent1 101 INTEGER (kind = C_INT), VALUE :: extent2 100 INTEGER (kind = C_INT), DIMENSION(*) :: extent 102 101 END SUBROUTINE cxios_set_gridgroup_mask2 103 102 104 SUBROUTINE cxios_get_gridgroup_mask2(gridgroup_hdl, mask2, extent 1, extent2) BIND(C)103 SUBROUTINE cxios_get_gridgroup_mask2(gridgroup_hdl, mask2, extent) BIND(C) 105 104 USE ISO_C_BINDING 106 105 INTEGER (kind = C_INTPTR_T), VALUE :: gridgroup_hdl 107 106 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask2 108 INTEGER (kind = C_INT), VALUE :: extent1 109 INTEGER (kind = C_INT), VALUE :: extent2 107 INTEGER (kind = C_INT), DIMENSION(*) :: extent 110 108 END SUBROUTINE cxios_get_gridgroup_mask2 111 109 … … 117 115 118 116 119 SUBROUTINE cxios_set_gridgroup_mask3(gridgroup_hdl, mask3, extent 1, extent2, extent3) BIND(C)117 SUBROUTINE cxios_set_gridgroup_mask3(gridgroup_hdl, mask3, extent) BIND(C) 120 118 USE ISO_C_BINDING 121 119 INTEGER (kind = C_INTPTR_T), VALUE :: gridgroup_hdl 122 120 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask3 123 INTEGER (kind = C_INT), VALUE :: extent1 124 INTEGER (kind = C_INT), VALUE :: extent2 125 INTEGER (kind = C_INT), VALUE :: extent3 121 INTEGER (kind = C_INT), DIMENSION(*) :: extent 126 122 END SUBROUTINE cxios_set_gridgroup_mask3 127 123 128 SUBROUTINE cxios_get_gridgroup_mask3(gridgroup_hdl, mask3, extent 1, extent2, extent3) BIND(C)124 SUBROUTINE cxios_get_gridgroup_mask3(gridgroup_hdl, mask3, extent) BIND(C) 129 125 USE ISO_C_BINDING 130 126 INTEGER (kind = C_INTPTR_T), VALUE :: gridgroup_hdl 131 127 LOGICAL (KIND=C_BOOL) , DIMENSION(*) :: mask3 132 INTEGER (kind = C_INT), VALUE :: extent1 133 INTEGER (kind = C_INT), VALUE :: extent2 134 INTEGER (kind = C_INT), VALUE :: extent3 128 INTEGER (kind = C_INT), DIMENSION(*) :: extent 135 129 END SUBROUTINE cxios_get_gridgroup_mask3 136 130 -
XIOS/trunk/src/interface/fortran_attr/iaxis_attr.F90
r666 r674 103 103 104 104 IF (PRESENT(bounds_)) THEN 105 CALL cxios_set_axis_bounds(axis_hdl%daddr, bounds_, size(bounds_,1), size(bounds_,2))105 CALL cxios_set_axis_bounds(axis_hdl%daddr, bounds_, SHAPE(bounds_)) 106 106 ENDIF 107 107 … … 111 111 112 112 IF (PRESENT(data_index_)) THEN 113 CALL cxios_set_axis_data_index(axis_hdl%daddr, data_index_, size(data_index_,1))113 CALL cxios_set_axis_data_index(axis_hdl%daddr, data_index_, SHAPE(data_index_)) 114 114 ENDIF 115 115 … … 123 123 124 124 IF (PRESENT(mask_)) THEN 125 ALLOCATE(mask__tmp( size(mask_,1)))125 ALLOCATE(mask__tmp(SIZE(mask_,1))) 126 126 mask__tmp = mask_ 127 CALL cxios_set_axis_mask(axis_hdl%daddr, mask__tmp, size(mask_,1))127 CALL cxios_set_axis_mask(axis_hdl%daddr, mask__tmp, SHAPE(mask_)) 128 128 ENDIF 129 129 … … 153 153 154 154 IF (PRESENT(value_)) THEN 155 CALL cxios_set_axis_value(axis_hdl%daddr, value_, size(value_,1))155 CALL cxios_set_axis_value(axis_hdl%daddr, value_, SHAPE(value_)) 156 156 ENDIF 157 157 … … 250 250 251 251 IF (PRESENT(bounds_)) THEN 252 CALL cxios_get_axis_bounds(axis_hdl%daddr, bounds_, size(bounds_,1), size(bounds_,2))252 CALL cxios_get_axis_bounds(axis_hdl%daddr, bounds_, SHAPE(bounds_)) 253 253 ENDIF 254 254 … … 258 258 259 259 IF (PRESENT(data_index_)) THEN 260 CALL cxios_get_axis_data_index(axis_hdl%daddr, data_index_, size(data_index_,1))260 CALL cxios_get_axis_data_index(axis_hdl%daddr, data_index_, SHAPE(data_index_)) 261 261 ENDIF 262 262 … … 270 270 271 271 IF (PRESENT(mask_)) THEN 272 ALLOCATE(mask__tmp( size(mask_,1)))273 CALL cxios_get_axis_mask(axis_hdl%daddr, mask__tmp, size(mask_,1))272 ALLOCATE(mask__tmp(SIZE(mask_,1))) 273 CALL cxios_get_axis_mask(axis_hdl%daddr, mask__tmp, SHAPE(mask_)) 274 274 mask_ = mask__tmp 275 275 ENDIF … … 300 300 301 301 IF (PRESENT(value_)) THEN 302 CALL cxios_get_axis_value(axis_hdl%daddr, value_, size(value_,1))302 CALL cxios_get_axis_value(axis_hdl%daddr, value_, SHAPE(value_)) 303 303 ENDIF 304 304 -
XIOS/trunk/src/interface/fortran_attr/iaxisgroup_attr.F90
r666 r674 106 106 107 107 IF (PRESENT(bounds_)) THEN 108 CALL cxios_set_axisgroup_bounds(axisgroup_hdl%daddr, bounds_, size(bounds_,1), size(bounds_,2))108 CALL cxios_set_axisgroup_bounds(axisgroup_hdl%daddr, bounds_, SHAPE(bounds_)) 109 109 ENDIF 110 110 … … 114 114 115 115 IF (PRESENT(data_index_)) THEN 116 CALL cxios_set_axisgroup_data_index(axisgroup_hdl%daddr, data_index_, size(data_index_,1))116 CALL cxios_set_axisgroup_data_index(axisgroup_hdl%daddr, data_index_, SHAPE(data_index_)) 117 117 ENDIF 118 118 … … 130 130 131 131 IF (PRESENT(mask_)) THEN 132 ALLOCATE(mask__tmp( size(mask_,1)))132 ALLOCATE(mask__tmp(SIZE(mask_,1))) 133 133 mask__tmp = mask_ 134 CALL cxios_set_axisgroup_mask(axisgroup_hdl%daddr, mask__tmp, size(mask_,1))134 CALL cxios_set_axisgroup_mask(axisgroup_hdl%daddr, mask__tmp, SHAPE(mask_)) 135 135 ENDIF 136 136 … … 160 160 161 161 IF (PRESENT(value_)) THEN 162 CALL cxios_set_axisgroup_value(axisgroup_hdl%daddr, value_, size(value_,1))162 CALL cxios_set_axisgroup_value(axisgroup_hdl%daddr, value_, SHAPE(value_)) 163 163 ENDIF 164 164 … … 260 260 261 261 IF (PRESENT(bounds_)) THEN 262 CALL cxios_get_axisgroup_bounds(axisgroup_hdl%daddr, bounds_, size(bounds_,1), size(bounds_,2))262 CALL cxios_get_axisgroup_bounds(axisgroup_hdl%daddr, bounds_, SHAPE(bounds_)) 263 263 ENDIF 264 264 … … 268 268 269 269 IF (PRESENT(data_index_)) THEN 270 CALL cxios_get_axisgroup_data_index(axisgroup_hdl%daddr, data_index_, size(data_index_,1))270 CALL cxios_get_axisgroup_data_index(axisgroup_hdl%daddr, data_index_, SHAPE(data_index_)) 271 271 ENDIF 272 272 … … 284 284 285 285 IF (PRESENT(mask_)) THEN 286 ALLOCATE(mask__tmp( size(mask_,1)))287 CALL cxios_get_axisgroup_mask(axisgroup_hdl%daddr, mask__tmp, size(mask_,1))286 ALLOCATE(mask__tmp(SIZE(mask_,1))) 287 CALL cxios_get_axisgroup_mask(axisgroup_hdl%daddr, mask__tmp, SHAPE(mask_)) 288 288 mask_ = mask__tmp 289 289 ENDIF … … 314 314 315 315 IF (PRESENT(value_)) THEN 316 CALL cxios_get_axisgroup_value(axisgroup_hdl%daddr, value_, size(value_,1))316 CALL cxios_get_axisgroup_value(axisgroup_hdl%daddr, value_, SHAPE(value_)) 317 317 ENDIF 318 318 -
XIOS/trunk/src/interface/fortran_attr/icalendar_wrapper_attr.F90
r581 r674 93 93 94 94 IF (PRESENT(month_lengths_)) THEN 95 CALL cxios_set_calendar_wrapper_month_lengths(calendar_wrapper_hdl%daddr, month_lengths_, size(month_lengths_,1))95 CALL cxios_set_calendar_wrapper_month_lengths(calendar_wrapper_hdl%daddr, month_lengths_, SHAPE(month_lengths_)) 96 96 ENDIF 97 97 … … 200 200 201 201 IF (PRESENT(month_lengths_)) THEN 202 CALL cxios_get_calendar_wrapper_month_lengths(calendar_wrapper_hdl%daddr, month_lengths_, size(month_lengths_,1))202 CALL cxios_get_calendar_wrapper_month_lengths(calendar_wrapper_hdl%daddr, month_lengths_, SHAPE(month_lengths_)) 203 203 ENDIF 204 204 -
XIOS/trunk/src/interface/fortran_attr/idomain_attr.F90
r666 r674 163 163 164 164 IF (PRESENT(area_)) THEN 165 CALL cxios_set_domain_area(domain_hdl%daddr, area_, size(area_,1), size(area_,2))165 CALL cxios_set_domain_area(domain_hdl%daddr, area_, SHAPE(area_)) 166 166 ENDIF 167 167 168 168 IF (PRESENT(bounds_lat_1d_)) THEN 169 CALL cxios_set_domain_bounds_lat_1d(domain_hdl%daddr, bounds_lat_1d_, size(bounds_lat_1d_,1), size(bounds_lat_1d_,2))169 CALL cxios_set_domain_bounds_lat_1d(domain_hdl%daddr, bounds_lat_1d_, SHAPE(bounds_lat_1d_)) 170 170 ENDIF 171 171 172 172 IF (PRESENT(bounds_lat_2d_)) THEN 173 CALL cxios_set_domain_bounds_lat_2d(domain_hdl%daddr, bounds_lat_2d_, size(bounds_lat_2d_,1), size(bounds_lat_2d_,2), size(bounds_lat_2d_,3))173 CALL cxios_set_domain_bounds_lat_2d(domain_hdl%daddr, bounds_lat_2d_, SHAPE(bounds_lat_2d_)) 174 174 ENDIF 175 175 176 176 IF (PRESENT(bounds_lon_1d_)) THEN 177 CALL cxios_set_domain_bounds_lon_1d(domain_hdl%daddr, bounds_lon_1d_, size(bounds_lon_1d_,1), size(bounds_lon_1d_,2))177 CALL cxios_set_domain_bounds_lon_1d(domain_hdl%daddr, bounds_lon_1d_, SHAPE(bounds_lon_1d_)) 178 178 ENDIF 179 179 180 180 IF (PRESENT(bounds_lon_2d_)) THEN 181 CALL cxios_set_domain_bounds_lon_2d(domain_hdl%daddr, bounds_lon_2d_, size(bounds_lon_2d_,1), size(bounds_lon_2d_,2), size(bounds_lon_2d_,3))181 CALL cxios_set_domain_bounds_lon_2d(domain_hdl%daddr, bounds_lon_2d_, SHAPE(bounds_lon_2d_)) 182 182 ENDIF 183 183 … … 187 187 188 188 IF (PRESENT(data_i_index_)) THEN 189 CALL cxios_set_domain_data_i_index(domain_hdl%daddr, data_i_index_, size(data_i_index_,1))189 CALL cxios_set_domain_data_i_index(domain_hdl%daddr, data_i_index_, SHAPE(data_i_index_)) 190 190 ENDIF 191 191 … … 195 195 196 196 IF (PRESENT(data_j_index_)) THEN 197 CALL cxios_set_domain_data_j_index(domain_hdl%daddr, data_j_index_, size(data_j_index_,1))197 CALL cxios_set_domain_data_j_index(domain_hdl%daddr, data_j_index_, SHAPE(data_j_index_)) 198 198 ENDIF 199 199 … … 219 219 220 220 IF (PRESENT(i_index_)) THEN 221 CALL cxios_set_domain_i_index(domain_hdl%daddr, i_index_, size(i_index_,1))221 CALL cxios_set_domain_i_index(domain_hdl%daddr, i_index_, SHAPE(i_index_)) 222 222 ENDIF 223 223 … … 227 227 228 228 IF (PRESENT(j_index_)) THEN 229 CALL cxios_set_domain_j_index(domain_hdl%daddr, j_index_, size(j_index_,1))229 CALL cxios_set_domain_j_index(domain_hdl%daddr, j_index_, SHAPE(j_index_)) 230 230 ENDIF 231 231 … … 235 235 236 236 IF (PRESENT(latvalue_1d_)) THEN 237 CALL cxios_set_domain_latvalue_1d(domain_hdl%daddr, latvalue_1d_, size(latvalue_1d_,1))237 CALL cxios_set_domain_latvalue_1d(domain_hdl%daddr, latvalue_1d_, SHAPE(latvalue_1d_)) 238 238 ENDIF 239 239 240 240 IF (PRESENT(latvalue_2d_)) THEN 241 CALL cxios_set_domain_latvalue_2d(domain_hdl%daddr, latvalue_2d_, size(latvalue_2d_,1), size(latvalue_2d_,2))241 CALL cxios_set_domain_latvalue_2d(domain_hdl%daddr, latvalue_2d_, SHAPE(latvalue_2d_)) 242 242 ENDIF 243 243 … … 247 247 248 248 IF (PRESENT(lonvalue_1d_)) THEN 249 CALL cxios_set_domain_lonvalue_1d(domain_hdl%daddr, lonvalue_1d_, size(lonvalue_1d_,1))249 CALL cxios_set_domain_lonvalue_1d(domain_hdl%daddr, lonvalue_1d_, SHAPE(lonvalue_1d_)) 250 250 ENDIF 251 251 252 252 IF (PRESENT(lonvalue_2d_)) THEN 253 CALL cxios_set_domain_lonvalue_2d(domain_hdl%daddr, lonvalue_2d_, size(lonvalue_2d_,1), size(lonvalue_2d_,2))253 CALL cxios_set_domain_lonvalue_2d(domain_hdl%daddr, lonvalue_2d_, SHAPE(lonvalue_2d_)) 254 254 ENDIF 255 255 256 256 IF (PRESENT(mask_1d_)) THEN 257 ALLOCATE(mask_1d__tmp( size(mask_1d_,1)))257 ALLOCATE(mask_1d__tmp(SIZE(mask_1d_,1))) 258 258 mask_1d__tmp = mask_1d_ 259 CALL cxios_set_domain_mask_1d(domain_hdl%daddr, mask_1d__tmp, size(mask_1d_,1))259 CALL cxios_set_domain_mask_1d(domain_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_)) 260 260 ENDIF 261 261 262 262 IF (PRESENT(mask_2d_)) THEN 263 ALLOCATE(mask_2d__tmp( size(mask_2d_,1), size(mask_2d_,2)))263 ALLOCATE(mask_2d__tmp(SIZE(mask_2d_,1), SIZE(mask_2d_,2))) 264 264 mask_2d__tmp = mask_2d_ 265 CALL cxios_set_domain_mask_2d(domain_hdl%daddr, mask_2d__tmp, size(mask_2d_,1), size(mask_2d_,2))265 CALL cxios_set_domain_mask_2d(domain_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_)) 266 266 ENDIF 267 267 … … 452 452 453 453 IF (PRESENT(area_)) THEN 454 CALL cxios_get_domain_area(domain_hdl%daddr, area_, size(area_,1), size(area_,2))454 CALL cxios_get_domain_area(domain_hdl%daddr, area_, SHAPE(area_)) 455 455 ENDIF 456 456 457 457 IF (PRESENT(bounds_lat_1d_)) THEN 458 CALL cxios_get_domain_bounds_lat_1d(domain_hdl%daddr, bounds_lat_1d_, size(bounds_lat_1d_,1), size(bounds_lat_1d_,2))458 CALL cxios_get_domain_bounds_lat_1d(domain_hdl%daddr, bounds_lat_1d_, SHAPE(bounds_lat_1d_)) 459 459 ENDIF 460 460 461 461 IF (PRESENT(bounds_lat_2d_)) THEN 462 CALL cxios_get_domain_bounds_lat_2d(domain_hdl%daddr, bounds_lat_2d_, size(bounds_lat_2d_,1), size(bounds_lat_2d_,2), size(bounds_lat_2d_,3))462 CALL cxios_get_domain_bounds_lat_2d(domain_hdl%daddr, bounds_lat_2d_, SHAPE(bounds_lat_2d_)) 463 463 ENDIF 464 464 465 465 IF (PRESENT(bounds_lon_1d_)) THEN 466 CALL cxios_get_domain_bounds_lon_1d(domain_hdl%daddr, bounds_lon_1d_, size(bounds_lon_1d_,1), size(bounds_lon_1d_,2))466 CALL cxios_get_domain_bounds_lon_1d(domain_hdl%daddr, bounds_lon_1d_, SHAPE(bounds_lon_1d_)) 467 467 ENDIF 468 468 469 469 IF (PRESENT(bounds_lon_2d_)) THEN 470 CALL cxios_get_domain_bounds_lon_2d(domain_hdl%daddr, bounds_lon_2d_, size(bounds_lon_2d_,1), size(bounds_lon_2d_,2), size(bounds_lon_2d_,3))470 CALL cxios_get_domain_bounds_lon_2d(domain_hdl%daddr, bounds_lon_2d_, SHAPE(bounds_lon_2d_)) 471 471 ENDIF 472 472 … … 476 476 477 477 IF (PRESENT(data_i_index_)) THEN 478 CALL cxios_get_domain_data_i_index(domain_hdl%daddr, data_i_index_, size(data_i_index_,1))478 CALL cxios_get_domain_data_i_index(domain_hdl%daddr, data_i_index_, SHAPE(data_i_index_)) 479 479 ENDIF 480 480 … … 484 484 485 485 IF (PRESENT(data_j_index_)) THEN 486 CALL cxios_get_domain_data_j_index(domain_hdl%daddr, data_j_index_, size(data_j_index_,1))486 CALL cxios_get_domain_data_j_index(domain_hdl%daddr, data_j_index_, SHAPE(data_j_index_)) 487 487 ENDIF 488 488 … … 508 508 509 509 IF (PRESENT(i_index_)) THEN 510 CALL cxios_get_domain_i_index(domain_hdl%daddr, i_index_, size(i_index_,1))510 CALL cxios_get_domain_i_index(domain_hdl%daddr, i_index_, SHAPE(i_index_)) 511 511 ENDIF 512 512 … … 516 516 517 517 IF (PRESENT(j_index_)) THEN 518 CALL cxios_get_domain_j_index(domain_hdl%daddr, j_index_, size(j_index_,1))518 CALL cxios_get_domain_j_index(domain_hdl%daddr, j_index_, SHAPE(j_index_)) 519 519 ENDIF 520 520 … … 524 524 525 525 IF (PRESENT(latvalue_1d_)) THEN 526 CALL cxios_get_domain_latvalue_1d(domain_hdl%daddr, latvalue_1d_, size(latvalue_1d_,1))526 CALL cxios_get_domain_latvalue_1d(domain_hdl%daddr, latvalue_1d_, SHAPE(latvalue_1d_)) 527 527 ENDIF 528 528 529 529 IF (PRESENT(latvalue_2d_)) THEN 530 CALL cxios_get_domain_latvalue_2d(domain_hdl%daddr, latvalue_2d_, size(latvalue_2d_,1), size(latvalue_2d_,2))530 CALL cxios_get_domain_latvalue_2d(domain_hdl%daddr, latvalue_2d_, SHAPE(latvalue_2d_)) 531 531 ENDIF 532 532 … … 536 536 537 537 IF (PRESENT(lonvalue_1d_)) THEN 538 CALL cxios_get_domain_lonvalue_1d(domain_hdl%daddr, lonvalue_1d_, size(lonvalue_1d_,1))538 CALL cxios_get_domain_lonvalue_1d(domain_hdl%daddr, lonvalue_1d_, SHAPE(lonvalue_1d_)) 539 539 ENDIF 540 540 541 541 IF (PRESENT(lonvalue_2d_)) THEN 542 CALL cxios_get_domain_lonvalue_2d(domain_hdl%daddr, lonvalue_2d_, size(lonvalue_2d_,1), size(lonvalue_2d_,2))542 CALL cxios_get_domain_lonvalue_2d(domain_hdl%daddr, lonvalue_2d_, SHAPE(lonvalue_2d_)) 543 543 ENDIF 544 544 545 545 IF (PRESENT(mask_1d_)) THEN 546 ALLOCATE(mask_1d__tmp( size(mask_1d_,1)))547 CALL cxios_get_domain_mask_1d(domain_hdl%daddr, mask_1d__tmp, size(mask_1d_,1))546 ALLOCATE(mask_1d__tmp(SIZE(mask_1d_,1))) 547 CALL cxios_get_domain_mask_1d(domain_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_)) 548 548 mask_1d_ = mask_1d__tmp 549 549 ENDIF 550 550 551 551 IF (PRESENT(mask_2d_)) THEN 552 ALLOCATE(mask_2d__tmp( size(mask_2d_,1), size(mask_2d_,2)))553 CALL cxios_get_domain_mask_2d(domain_hdl%daddr, mask_2d__tmp, size(mask_2d_,1), size(mask_2d_,2))552 ALLOCATE(mask_2d__tmp(SIZE(mask_2d_,1), SIZE(mask_2d_,2))) 553 CALL cxios_get_domain_mask_2d(domain_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_)) 554 554 mask_2d_ = mask_2d__tmp 555 555 ENDIF -
XIOS/trunk/src/interface/fortran_attr/idomaingroup_attr.F90
r666 r674 170 170 171 171 IF (PRESENT(area_)) THEN 172 CALL cxios_set_domaingroup_area(domaingroup_hdl%daddr, area_, size(area_,1), size(area_,2))172 CALL cxios_set_domaingroup_area(domaingroup_hdl%daddr, area_, SHAPE(area_)) 173 173 ENDIF 174 174 175 175 IF (PRESENT(bounds_lat_1d_)) THEN 176 CALL cxios_set_domaingroup_bounds_lat_1d(domaingroup_hdl%daddr, bounds_lat_1d_, size(bounds_lat_1d_,1), size(bounds_lat_1d_,2))176 CALL cxios_set_domaingroup_bounds_lat_1d(domaingroup_hdl%daddr, bounds_lat_1d_, SHAPE(bounds_lat_1d_)) 177 177 ENDIF 178 178 179 179 IF (PRESENT(bounds_lat_2d_)) THEN 180 CALL cxios_set_domaingroup_bounds_lat_2d(domaingroup_hdl%daddr, bounds_lat_2d_, size(bounds_lat_2d_,1), size(bounds_lat_2d_,2), size(bounds_lat_2d_,3))180 CALL cxios_set_domaingroup_bounds_lat_2d(domaingroup_hdl%daddr, bounds_lat_2d_, SHAPE(bounds_lat_2d_)) 181 181 ENDIF 182 182 183 183 IF (PRESENT(bounds_lon_1d_)) THEN 184 CALL cxios_set_domaingroup_bounds_lon_1d(domaingroup_hdl%daddr, bounds_lon_1d_, size(bounds_lon_1d_,1), size(bounds_lon_1d_,2))184 CALL cxios_set_domaingroup_bounds_lon_1d(domaingroup_hdl%daddr, bounds_lon_1d_, SHAPE(bounds_lon_1d_)) 185 185 ENDIF 186 186 187 187 IF (PRESENT(bounds_lon_2d_)) THEN 188 CALL cxios_set_domaingroup_bounds_lon_2d(domaingroup_hdl%daddr, bounds_lon_2d_, size(bounds_lon_2d_,1), size(bounds_lon_2d_,2), size(bounds_lon_2d_,3))188 CALL cxios_set_domaingroup_bounds_lon_2d(domaingroup_hdl%daddr, bounds_lon_2d_, SHAPE(bounds_lon_2d_)) 189 189 ENDIF 190 190 … … 194 194 195 195 IF (PRESENT(data_i_index_)) THEN 196 CALL cxios_set_domaingroup_data_i_index(domaingroup_hdl%daddr, data_i_index_, size(data_i_index_,1))196 CALL cxios_set_domaingroup_data_i_index(domaingroup_hdl%daddr, data_i_index_, SHAPE(data_i_index_)) 197 197 ENDIF 198 198 … … 202 202 203 203 IF (PRESENT(data_j_index_)) THEN 204 CALL cxios_set_domaingroup_data_j_index(domaingroup_hdl%daddr, data_j_index_, size(data_j_index_,1))204 CALL cxios_set_domaingroup_data_j_index(domaingroup_hdl%daddr, data_j_index_, SHAPE(data_j_index_)) 205 205 ENDIF 206 206 … … 230 230 231 231 IF (PRESENT(i_index_)) THEN 232 CALL cxios_set_domaingroup_i_index(domaingroup_hdl%daddr, i_index_, size(i_index_,1))232 CALL cxios_set_domaingroup_i_index(domaingroup_hdl%daddr, i_index_, SHAPE(i_index_)) 233 233 ENDIF 234 234 … … 238 238 239 239 IF (PRESENT(j_index_)) THEN 240 CALL cxios_set_domaingroup_j_index(domaingroup_hdl%daddr, j_index_, size(j_index_,1))240 CALL cxios_set_domaingroup_j_index(domaingroup_hdl%daddr, j_index_, SHAPE(j_index_)) 241 241 ENDIF 242 242 … … 246 246 247 247 IF (PRESENT(latvalue_1d_)) THEN 248 CALL cxios_set_domaingroup_latvalue_1d(domaingroup_hdl%daddr, latvalue_1d_, size(latvalue_1d_,1))248 CALL cxios_set_domaingroup_latvalue_1d(domaingroup_hdl%daddr, latvalue_1d_, SHAPE(latvalue_1d_)) 249 249 ENDIF 250 250 251 251 IF (PRESENT(latvalue_2d_)) THEN 252 CALL cxios_set_domaingroup_latvalue_2d(domaingroup_hdl%daddr, latvalue_2d_, size(latvalue_2d_,1), size(latvalue_2d_,2))252 CALL cxios_set_domaingroup_latvalue_2d(domaingroup_hdl%daddr, latvalue_2d_, SHAPE(latvalue_2d_)) 253 253 ENDIF 254 254 … … 258 258 259 259 IF (PRESENT(lonvalue_1d_)) THEN 260 CALL cxios_set_domaingroup_lonvalue_1d(domaingroup_hdl%daddr, lonvalue_1d_, size(lonvalue_1d_,1))260 CALL cxios_set_domaingroup_lonvalue_1d(domaingroup_hdl%daddr, lonvalue_1d_, SHAPE(lonvalue_1d_)) 261 261 ENDIF 262 262 263 263 IF (PRESENT(lonvalue_2d_)) THEN 264 CALL cxios_set_domaingroup_lonvalue_2d(domaingroup_hdl%daddr, lonvalue_2d_, size(lonvalue_2d_,1), size(lonvalue_2d_,2))264 CALL cxios_set_domaingroup_lonvalue_2d(domaingroup_hdl%daddr, lonvalue_2d_, SHAPE(lonvalue_2d_)) 265 265 ENDIF 266 266 267 267 IF (PRESENT(mask_1d_)) THEN 268 ALLOCATE(mask_1d__tmp( size(mask_1d_,1)))268 ALLOCATE(mask_1d__tmp(SIZE(mask_1d_,1))) 269 269 mask_1d__tmp = mask_1d_ 270 CALL cxios_set_domaingroup_mask_1d(domaingroup_hdl%daddr, mask_1d__tmp, size(mask_1d_,1))270 CALL cxios_set_domaingroup_mask_1d(domaingroup_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_)) 271 271 ENDIF 272 272 273 273 IF (PRESENT(mask_2d_)) THEN 274 ALLOCATE(mask_2d__tmp( size(mask_2d_,1), size(mask_2d_,2)))274 ALLOCATE(mask_2d__tmp(SIZE(mask_2d_,1), SIZE(mask_2d_,2))) 275 275 mask_2d__tmp = mask_2d_ 276 CALL cxios_set_domaingroup_mask_2d(domaingroup_hdl%daddr, mask_2d__tmp, size(mask_2d_,1), size(mask_2d_,2))276 CALL cxios_set_domaingroup_mask_2d(domaingroup_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_)) 277 277 ENDIF 278 278 … … 470 470 471 471 IF (PRESENT(area_)) THEN 472 CALL cxios_get_domaingroup_area(domaingroup_hdl%daddr, area_, size(area_,1), size(area_,2))472 CALL cxios_get_domaingroup_area(domaingroup_hdl%daddr, area_, SHAPE(area_)) 473 473 ENDIF 474 474 475 475 IF (PRESENT(bounds_lat_1d_)) THEN 476 CALL cxios_get_domaingroup_bounds_lat_1d(domaingroup_hdl%daddr, bounds_lat_1d_, size(bounds_lat_1d_,1), size(bounds_lat_1d_,2))476 CALL cxios_get_domaingroup_bounds_lat_1d(domaingroup_hdl%daddr, bounds_lat_1d_, SHAPE(bounds_lat_1d_)) 477 477 ENDIF 478 478 479 479 IF (PRESENT(bounds_lat_2d_)) THEN 480 CALL cxios_get_domaingroup_bounds_lat_2d(domaingroup_hdl%daddr, bounds_lat_2d_, size(bounds_lat_2d_,1), size(bounds_lat_2d_,2), size(bounds_lat_2d_,3))480 CALL cxios_get_domaingroup_bounds_lat_2d(domaingroup_hdl%daddr, bounds_lat_2d_, SHAPE(bounds_lat_2d_)) 481 481 ENDIF 482 482 483 483 IF (PRESENT(bounds_lon_1d_)) THEN 484 CALL cxios_get_domaingroup_bounds_lon_1d(domaingroup_hdl%daddr, bounds_lon_1d_, size(bounds_lon_1d_,1), size(bounds_lon_1d_,2))484 CALL cxios_get_domaingroup_bounds_lon_1d(domaingroup_hdl%daddr, bounds_lon_1d_, SHAPE(bounds_lon_1d_)) 485 485 ENDIF 486 486 487 487 IF (PRESENT(bounds_lon_2d_)) THEN 488 CALL cxios_get_domaingroup_bounds_lon_2d(domaingroup_hdl%daddr, bounds_lon_2d_, size(bounds_lon_2d_,1), size(bounds_lon_2d_,2), size(bounds_lon_2d_,3))488 CALL cxios_get_domaingroup_bounds_lon_2d(domaingroup_hdl%daddr, bounds_lon_2d_, SHAPE(bounds_lon_2d_)) 489 489 ENDIF 490 490 … … 494 494 495 495 IF (PRESENT(data_i_index_)) THEN 496 CALL cxios_get_domaingroup_data_i_index(domaingroup_hdl%daddr, data_i_index_, size(data_i_index_,1))496 CALL cxios_get_domaingroup_data_i_index(domaingroup_hdl%daddr, data_i_index_, SHAPE(data_i_index_)) 497 497 ENDIF 498 498 … … 502 502 503 503 IF (PRESENT(data_j_index_)) THEN 504 CALL cxios_get_domaingroup_data_j_index(domaingroup_hdl%daddr, data_j_index_, size(data_j_index_,1))504 CALL cxios_get_domaingroup_data_j_index(domaingroup_hdl%daddr, data_j_index_, SHAPE(data_j_index_)) 505 505 ENDIF 506 506 … … 530 530 531 531 IF (PRESENT(i_index_)) THEN 532 CALL cxios_get_domaingroup_i_index(domaingroup_hdl%daddr, i_index_, size(i_index_,1))532 CALL cxios_get_domaingroup_i_index(domaingroup_hdl%daddr, i_index_, SHAPE(i_index_)) 533 533 ENDIF 534 534 … … 538 538 539 539 IF (PRESENT(j_index_)) THEN 540 CALL cxios_get_domaingroup_j_index(domaingroup_hdl%daddr, j_index_, size(j_index_,1))540 CALL cxios_get_domaingroup_j_index(domaingroup_hdl%daddr, j_index_, SHAPE(j_index_)) 541 541 ENDIF 542 542 … … 546 546 547 547 IF (PRESENT(latvalue_1d_)) THEN 548 CALL cxios_get_domaingroup_latvalue_1d(domaingroup_hdl%daddr, latvalue_1d_, size(latvalue_1d_,1))548 CALL cxios_get_domaingroup_latvalue_1d(domaingroup_hdl%daddr, latvalue_1d_, SHAPE(latvalue_1d_)) 549 549 ENDIF 550 550 551 551 IF (PRESENT(latvalue_2d_)) THEN 552 CALL cxios_get_domaingroup_latvalue_2d(domaingroup_hdl%daddr, latvalue_2d_, size(latvalue_2d_,1), size(latvalue_2d_,2))552 CALL cxios_get_domaingroup_latvalue_2d(domaingroup_hdl%daddr, latvalue_2d_, SHAPE(latvalue_2d_)) 553 553 ENDIF 554 554 … … 558 558 559 559 IF (PRESENT(lonvalue_1d_)) THEN 560 CALL cxios_get_domaingroup_lonvalue_1d(domaingroup_hdl%daddr, lonvalue_1d_, size(lonvalue_1d_,1))560 CALL cxios_get_domaingroup_lonvalue_1d(domaingroup_hdl%daddr, lonvalue_1d_, SHAPE(lonvalue_1d_)) 561 561 ENDIF 562 562 563 563 IF (PRESENT(lonvalue_2d_)) THEN 564 CALL cxios_get_domaingroup_lonvalue_2d(domaingroup_hdl%daddr, lonvalue_2d_, size(lonvalue_2d_,1), size(lonvalue_2d_,2))564 CALL cxios_get_domaingroup_lonvalue_2d(domaingroup_hdl%daddr, lonvalue_2d_, SHAPE(lonvalue_2d_)) 565 565 ENDIF 566 566 567 567 IF (PRESENT(mask_1d_)) THEN 568 ALLOCATE(mask_1d__tmp( size(mask_1d_,1)))569 CALL cxios_get_domaingroup_mask_1d(domaingroup_hdl%daddr, mask_1d__tmp, size(mask_1d_,1))568 ALLOCATE(mask_1d__tmp(SIZE(mask_1d_,1))) 569 CALL cxios_get_domaingroup_mask_1d(domaingroup_hdl%daddr, mask_1d__tmp, SHAPE(mask_1d_)) 570 570 mask_1d_ = mask_1d__tmp 571 571 ENDIF 572 572 573 573 IF (PRESENT(mask_2d_)) THEN 574 ALLOCATE(mask_2d__tmp( size(mask_2d_,1), size(mask_2d_,2)))575 CALL cxios_get_domaingroup_mask_2d(domaingroup_hdl%daddr, mask_2d__tmp, size(mask_2d_,1), size(mask_2d_,2))574 ALLOCATE(mask_2d__tmp(SIZE(mask_2d_,1), SIZE(mask_2d_,2))) 575 CALL cxios_get_domaingroup_mask_2d(domaingroup_hdl%daddr, mask_2d__tmp, SHAPE(mask_2d_)) 576 576 mask_2d_ = mask_2d__tmp 577 577 ENDIF -
XIOS/trunk/src/interface/fortran_attr/igrid_attr.F90
r581 r674 72 72 73 73 IF (PRESENT(axis_domain_order_)) THEN 74 ALLOCATE(axis_domain_order__tmp( size(axis_domain_order_,1)))74 ALLOCATE(axis_domain_order__tmp(SIZE(axis_domain_order_,1))) 75 75 axis_domain_order__tmp = axis_domain_order_ 76 CALL cxios_set_grid_axis_domain_order(grid_hdl%daddr, axis_domain_order__tmp, size(axis_domain_order_,1))76 CALL cxios_set_grid_axis_domain_order(grid_hdl%daddr, axis_domain_order__tmp, SHAPE(axis_domain_order_)) 77 77 ENDIF 78 78 … … 82 82 83 83 IF (PRESENT(mask1_)) THEN 84 ALLOCATE(mask1__tmp( size(mask1_,1)))84 ALLOCATE(mask1__tmp(SIZE(mask1_,1))) 85 85 mask1__tmp = mask1_ 86 CALL cxios_set_grid_mask1(grid_hdl%daddr, mask1__tmp, size(mask1_,1))86 CALL cxios_set_grid_mask1(grid_hdl%daddr, mask1__tmp, SHAPE(mask1_)) 87 87 ENDIF 88 88 89 89 IF (PRESENT(mask2_)) THEN 90 ALLOCATE(mask2__tmp( size(mask2_,1), size(mask2_,2)))90 ALLOCATE(mask2__tmp(SIZE(mask2_,1), SIZE(mask2_,2))) 91 91 mask2__tmp = mask2_ 92 CALL cxios_set_grid_mask2(grid_hdl%daddr, mask2__tmp, size(mask2_,1), size(mask2_,2))92 CALL cxios_set_grid_mask2(grid_hdl%daddr, mask2__tmp, SHAPE(mask2_)) 93 93 ENDIF 94 94 95 95 IF (PRESENT(mask3_)) THEN 96 ALLOCATE(mask3__tmp( size(mask3_,1), size(mask3_,2), size(mask3_,3)))96 ALLOCATE(mask3__tmp(SIZE(mask3_,1), SIZE(mask3_,2), SIZE(mask3_,3))) 97 97 mask3__tmp = mask3_ 98 CALL cxios_set_grid_mask3(grid_hdl%daddr, mask3__tmp, size(mask3_,1), size(mask3_,2), size(mask3_,3))98 CALL cxios_set_grid_mask3(grid_hdl%daddr, mask3__tmp, SHAPE(mask3_)) 99 99 ENDIF 100 100 … … 166 166 167 167 IF (PRESENT(axis_domain_order_)) THEN 168 ALLOCATE(axis_domain_order__tmp( size(axis_domain_order_,1)))169 CALL cxios_get_grid_axis_domain_order(grid_hdl%daddr, axis_domain_order__tmp, size(axis_domain_order_,1))168 ALLOCATE(axis_domain_order__tmp(SIZE(axis_domain_order_,1))) 169 CALL cxios_get_grid_axis_domain_order(grid_hdl%daddr, axis_domain_order__tmp, SHAPE(axis_domain_order_)) 170 170 axis_domain_order_ = axis_domain_order__tmp 171 171 ENDIF … … 176 176 177 177 IF (PRESENT(mask1_)) THEN 178 ALLOCATE(mask1__tmp( size(mask1_,1)))179 CALL cxios_get_grid_mask1(grid_hdl%daddr, mask1__tmp, size(mask1_,1))178 ALLOCATE(mask1__tmp(SIZE(mask1_,1))) 179 CALL cxios_get_grid_mask1(grid_hdl%daddr, mask1__tmp, SHAPE(mask1_)) 180 180 mask1_ = mask1__tmp 181 181 ENDIF 182 182 183 183 IF (PRESENT(mask2_)) THEN 184 ALLOCATE(mask2__tmp( size(mask2_,1), size(mask2_,2)))185 CALL cxios_get_grid_mask2(grid_hdl%daddr, mask2__tmp, size(mask2_,1), size(mask2_,2))184 ALLOCATE(mask2__tmp(SIZE(mask2_,1), SIZE(mask2_,2))) 185 CALL cxios_get_grid_mask2(grid_hdl%daddr, mask2__tmp, SHAPE(mask2_)) 186 186 mask2_ = mask2__tmp 187 187 ENDIF 188 188 189 189 IF (PRESENT(mask3_)) THEN 190 ALLOCATE(mask3__tmp( size(mask3_,1), size(mask3_,2), size(mask3_,3)))191 CALL cxios_get_grid_mask3(grid_hdl%daddr, mask3__tmp, size(mask3_,1), size(mask3_,2), size(mask3_,3))190 ALLOCATE(mask3__tmp(SIZE(mask3_,1), SIZE(mask3_,2), SIZE(mask3_,3))) 191 CALL cxios_get_grid_mask3(grid_hdl%daddr, mask3__tmp, SHAPE(mask3_)) 192 192 mask3_ = mask3__tmp 193 193 ENDIF -
XIOS/trunk/src/interface/fortran_attr/igridgroup_attr.F90
r581 r674 76 76 77 77 IF (PRESENT(axis_domain_order_)) THEN 78 ALLOCATE(axis_domain_order__tmp( size(axis_domain_order_,1)))78 ALLOCATE(axis_domain_order__tmp(SIZE(axis_domain_order_,1))) 79 79 axis_domain_order__tmp = axis_domain_order_ 80 CALL cxios_set_gridgroup_axis_domain_order(gridgroup_hdl%daddr, axis_domain_order__tmp, size(axis_domain_order_,1))80 CALL cxios_set_gridgroup_axis_domain_order(gridgroup_hdl%daddr, axis_domain_order__tmp, SHAPE(axis_domain_order_)) 81 81 ENDIF 82 82 … … 90 90 91 91 IF (PRESENT(mask1_)) THEN 92 ALLOCATE(mask1__tmp( size(mask1_,1)))92 ALLOCATE(mask1__tmp(SIZE(mask1_,1))) 93 93 mask1__tmp = mask1_ 94 CALL cxios_set_gridgroup_mask1(gridgroup_hdl%daddr, mask1__tmp, size(mask1_,1))94 CALL cxios_set_gridgroup_mask1(gridgroup_hdl%daddr, mask1__tmp, SHAPE(mask1_)) 95 95 ENDIF 96 96 97 97 IF (PRESENT(mask2_)) THEN 98 ALLOCATE(mask2__tmp( size(mask2_,1), size(mask2_,2)))98 ALLOCATE(mask2__tmp(SIZE(mask2_,1), SIZE(mask2_,2))) 99 99 mask2__tmp = mask2_ 100 CALL cxios_set_gridgroup_mask2(gridgroup_hdl%daddr, mask2__tmp, size(mask2_,1), size(mask2_,2))100 CALL cxios_set_gridgroup_mask2(gridgroup_hdl%daddr, mask2__tmp, SHAPE(mask2_)) 101 101 ENDIF 102 102 103 103 IF (PRESENT(mask3_)) THEN 104 ALLOCATE(mask3__tmp( size(mask3_,1), size(mask3_,2), size(mask3_,3)))104 ALLOCATE(mask3__tmp(SIZE(mask3_,1), SIZE(mask3_,2), SIZE(mask3_,3))) 105 105 mask3__tmp = mask3_ 106 CALL cxios_set_gridgroup_mask3(gridgroup_hdl%daddr, mask3__tmp, size(mask3_,1), size(mask3_,2), size(mask3_,3))106 CALL cxios_set_gridgroup_mask3(gridgroup_hdl%daddr, mask3__tmp, SHAPE(mask3_)) 107 107 ENDIF 108 108 … … 178 178 179 179 IF (PRESENT(axis_domain_order_)) THEN 180 ALLOCATE(axis_domain_order__tmp( size(axis_domain_order_,1)))181 CALL cxios_get_gridgroup_axis_domain_order(gridgroup_hdl%daddr, axis_domain_order__tmp, size(axis_domain_order_,1))180 ALLOCATE(axis_domain_order__tmp(SIZE(axis_domain_order_,1))) 181 CALL cxios_get_gridgroup_axis_domain_order(gridgroup_hdl%daddr, axis_domain_order__tmp, SHAPE(axis_domain_order_)) 182 182 axis_domain_order_ = axis_domain_order__tmp 183 183 ENDIF … … 192 192 193 193 IF (PRESENT(mask1_)) THEN 194 ALLOCATE(mask1__tmp( size(mask1_,1)))195 CALL cxios_get_gridgroup_mask1(gridgroup_hdl%daddr, mask1__tmp, size(mask1_,1))194 ALLOCATE(mask1__tmp(SIZE(mask1_,1))) 195 CALL cxios_get_gridgroup_mask1(gridgroup_hdl%daddr, mask1__tmp, SHAPE(mask1_)) 196 196 mask1_ = mask1__tmp 197 197 ENDIF 198 198 199 199 IF (PRESENT(mask2_)) THEN 200 ALLOCATE(mask2__tmp( size(mask2_,1), size(mask2_,2)))201 CALL cxios_get_gridgroup_mask2(gridgroup_hdl%daddr, mask2__tmp, size(mask2_,1), size(mask2_,2))200 ALLOCATE(mask2__tmp(SIZE(mask2_,1), SIZE(mask2_,2))) 201 CALL cxios_get_gridgroup_mask2(gridgroup_hdl%daddr, mask2__tmp, SHAPE(mask2_)) 202 202 mask2_ = mask2__tmp 203 203 ENDIF 204 204 205 205 IF (PRESENT(mask3_)) THEN 206 ALLOCATE(mask3__tmp( size(mask3_,1), size(mask3_,2), size(mask3_,3)))207 CALL cxios_get_gridgroup_mask3(gridgroup_hdl%daddr, mask3__tmp, size(mask3_,1), size(mask3_,2), size(mask3_,3))206 ALLOCATE(mask3__tmp(SIZE(mask3_,1), SIZE(mask3_,2), SIZE(mask3_,3))) 207 CALL cxios_get_gridgroup_mask3(gridgroup_hdl%daddr, mask3__tmp, SHAPE(mask3_)) 208 208 mask3_ = mask3__tmp 209 209 ENDIF
Note: See TracChangeset
for help on using the changeset viewer.