Changeset 1646 for XIOS/dev/dev_trunk_omp/src/interface
- Timestamp:
- 01/31/19 12:12:52 (5 years ago)
- Location:
- XIOS/dev/dev_trunk_omp/src/interface
- Files:
-
- 69 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/dev_trunk_omp/src/interface/c/icaxis.cpp
r1542 r1646 28 28 29 29 void cxios_axis_handle_create (XAxisPtr * _ret, const char * _id, int _id_len) 30 TRY 30 31 { 31 32 std::string id; … … 35 36 CTimer::get("XIOS").suspend() ; 36 37 } 38 CATCH_DUMP_STACK 37 39 38 40 void cxios_axisgroup_handle_create (XAxisGroupPtr * _ret, const char * _id, int _id_len) 41 TRY 39 42 { 40 43 std::string id; … … 44 47 CTimer::get("XIOS").suspend() ; 45 48 } 49 CATCH_DUMP_STACK 46 50 47 51 // -------------------- Vérification des identifiants ----------------------- 48 52 49 53 void cxios_axis_valid_id (bool * _ret, const char * _id, int _id_len) 54 TRY 50 55 { 51 56 std::string id; … … 56 61 CTimer::get("XIOS").suspend() ; 57 62 } 63 CATCH_DUMP_STACK 58 64 59 65 void cxios_axisgroup_valid_id (bool * _ret, const char * _id, int _id_len) 66 TRY 60 67 { 61 68 std::string id; … … 67 74 68 75 } 76 CATCH_DUMP_STACK 69 77 70 78 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/iccalendar.cpp
r1542 r1646 10 10 { 11 11 void cxios_update_calendar(int step) 12 TRY 12 13 { 13 14 CTimer::get("XIOS").resume(); … … 19 20 CTimer::get("XIOS").suspend(); 20 21 } 22 CATCH_DUMP_STACK 21 23 22 24 void cxios_get_current_date(cxios_date* current_date_c) 25 TRY 23 26 { 24 27 CTimer::get("XIOS").resume(); … … 37 40 CTimer::get("XIOS").suspend(); 38 41 } 42 CATCH_DUMP_STACK 39 43 40 44 int cxios_get_year_length_in_seconds(int year) 45 TRY 41 46 { 42 47 CTimer::get("XIOS").resume(); … … 50 55 return length; 51 56 } 57 CATCH_DUMP_STACK 52 58 53 59 int cxios_get_day_length_in_seconds() 60 TRY 54 61 { 55 62 CTimer::get("XIOS").resume(); … … 63 70 return length; 64 71 } 72 CATCH_DUMP_STACK 65 73 } -
XIOS/dev/dev_trunk_omp/src/interface/c/iccalendar_wrapper.cpp
r1542 r1646 29 29 30 30 void cxios_calendar_wrapper_handle_create(XCalendarWrapperPtr* _ret, const char* _id, int _id_len) 31 TRY 31 32 { 32 33 std::string id; … … 36 37 CTimer::get("XIOS").suspend(); 37 38 } 39 CATCH_DUMP_STACK 38 40 39 41 void cxios_get_current_calendar_wrapper(XCalendarWrapperPtr* _ret) 42 TRY 40 43 { 41 44 CTimer::get("XIOS").resume(); … … 43 46 CTimer::get("XIOS").suspend(); 44 47 } 48 CATCH_DUMP_STACK 45 49 46 50 // -------------------- Vérification des identifiants ----------------------- 47 51 48 52 void cxios_calendar_wrapper_valid_id(bool* _ret, const char* _id, int _id_len) 53 TRY 49 54 { 50 55 std::string id; … … 54 59 CTimer::get("XIOS").suspend(); 55 60 } 61 CATCH_DUMP_STACK 56 62 57 63 // ----------------------- Custom getters and setters ----------------------- 58 64 59 65 void cxios_set_calendar_wrapper_date_start_date(XCalendarWrapperPtr calendarWrapper_hdl, cxios_date start_date_c) 66 TRY 60 67 { 61 68 CTimer::get("XIOS").resume(); … … 70 77 CTimer::get("XIOS").suspend(); 71 78 } 79 CATCH_DUMP_STACK 72 80 73 81 void cxios_get_calendar_wrapper_date_start_date(XCalendarWrapperPtr calendarWrapper_hdl, cxios_date* start_date_c) 82 TRY 74 83 { 75 84 CTimer::get("XIOS").resume(); … … 83 92 CTimer::get("XIOS").suspend(); 84 93 } 94 CATCH_DUMP_STACK 85 95 86 96 void cxios_set_calendar_wrapper_date_time_origin(XCalendarWrapperPtr calendarWrapper_hdl, cxios_date time_origin_c) 97 TRY 87 98 { 88 99 CTimer::get("XIOS").resume(); … … 97 108 CTimer::get("XIOS").suspend(); 98 109 } 110 CATCH_DUMP_STACK 99 111 100 112 void cxios_get_calendar_wrapper_date_time_origin(XCalendarWrapperPtr calendarWrapper_hdl, cxios_date* time_origin_c) 113 TRY 101 114 { 102 115 CTimer::get("XIOS").resume(); … … 110 123 CTimer::get("XIOS").suspend(); 111 124 } 125 CATCH_DUMP_STACK 112 126 113 127 // ----------------------- Calendar creation and update ---------------------- 114 128 115 129 void cxios_create_calendar(XCalendarWrapperPtr calendarWrapper_hdl) 130 TRY 116 131 { 117 132 CTimer::get("XIOS").resume(); … … 119 134 CTimer::get("XIOS").suspend(); 120 135 } 136 CATCH_DUMP_STACK 121 137 122 138 void cxios_update_calendar_timestep(XCalendarWrapperPtr calendarWrapper_hdl) 139 TRY 123 140 { 124 141 CTimer::get("XIOS").resume(); … … 126 143 CTimer::get("XIOS").suspend(); 127 144 } 145 CATCH_DUMP_STACK 128 146 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/iccompute_connectivity_domain.cpp
r1542 r1646 25 25 // ------------------------ Création des handle ----------------------------- 26 26 void cxios_compute_connectivity_domain_handle_create(XComConDomainPtr * _ret, const char * _id, int _id_len) 27 TRY 27 28 { 28 29 std::string id; … … 32 33 CTimer::get("XIOS").suspend() ; 33 34 } 35 CATCH_DUMP_STACK 34 36 35 37 // -------------------- Vérification des identifiants ----------------------- 36 38 void cxios_compute_connectivity_domain_valid_id(bool * _ret, const char * _id, int _id_len) 39 TRY 37 40 { 38 41 std::string id; … … 43 46 CTimer::get("XIOS").suspend() ; 44 47 } 48 CATCH_DUMP_STACK 45 49 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/iccontext.cpp
r1542 r1646 32 32 33 33 void cxios_context_handle_create (XContextPtr * _ret, const char * _id, int _id_len) 34 TRY 34 35 { 35 36 std::string id; … … 54 55 // Lever une exeception ici 55 56 } 57 CATCH_DUMP_STACK 56 58 57 59 // ------------------------ Changements de contextes ------------------------ 58 60 59 61 void cxios_context_get_current(XContextPtr* context) 62 TRY 60 63 { 61 64 CTimer::get("XIOS").resume(); … … 63 66 CTimer::get("XIOS").suspend(); 64 67 } 68 CATCH_DUMP_STACK 65 69 66 70 void cxios_context_set_current(XContextPtr context, bool withswap) 71 TRY 67 72 { 68 73 CTimer::get("XIOS").resume() ; … … 70 75 CTimer::get("XIOS").suspend() ; 71 76 } 77 CATCH_DUMP_STACK 72 78 73 79 // -------------------- Vérification des identifiants ----------------------- 74 80 75 81 void cxios_context_valid_id (bool * _ret, const char * _id, int _id_len) 82 TRY 76 83 { 77 84 std::string id; … … 93 100 CTimer::get("XIOS").suspend(); 94 101 } 102 CATCH_DUMP_STACK 95 103 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/icdata.cpp
r1605 r1646 43 43 // it is only used from the parse_xml.exe standalone test tool. 44 44 void cxios_init(void) 45 TRY 45 46 { 46 47 CXios::initialize(); 47 48 } 49 CATCH_DUMP_STACK 48 50 49 51 void cxios_init_server(void) 52 TRY 50 53 { 51 54 CXios::initServerSide(); 52 55 } 56 CATCH_DUMP_STACK 53 57 54 58 void cxios_init_client(const char* client_id , int len_client_id, MPI_Fint* f_local_comm, MPI_Fint* f_return_comm ) 59 TRY 55 60 { 56 61 std::string str; … … 82 87 CTimer::get("XIOS").suspend(); 83 88 } 89 CATCH_DUMP_STACK 84 90 85 91 void cxios_context_initialize(const char* context_id , int len_context_id, MPI_Fint* f_comm) 92 TRY 86 93 { 87 94 std::string str; … … 100 107 CTimer::get("XIOS").suspend(); 101 108 } 109 CATCH_DUMP_STACK 102 110 103 111 void cxios_oasis_enddef() 112 TRY 104 113 { 105 114 CTimer::get("XIOS").resume(); … … 107 116 CTimer::get("XIOS").suspend(); 108 117 } 118 CATCH_DUMP_STACK 109 119 110 120 void cxios_context_is_initialized(const char* context_id , int len_context_id, bool* initialized) 121 TRY 111 122 { 112 123 std::string str; … … 118 129 CTimer::get("XIOS").suspend(); 119 130 } 120 121 void cxios_context_close_definition() 131 CATCH_DUMP_STACK 132 133 void cxios_context_close_definition() 134 TRY 122 135 { 123 136 CTimer::get("XIOS").resume(); … … 128 141 CTimer::get("XIOS").suspend(); 129 142 } 143 CATCH_DUMP_STACK 130 144 131 145 void cxios_context_finalize() 146 TRY 132 147 { 133 148 CTimer::get("XIOS").resume(); … … 138 153 CTimer::get("XIOS").suspend(); 139 154 } 155 CATCH_DUMP_STACK 140 156 141 157 void cxios_finalize() 158 TRY 142 159 { 143 160 CTimer::get("XIOS").resume(); … … 145 162 CXios::clientFinalize(); 146 163 } 164 CATCH_DUMP_STACK 147 165 148 166 void cxios_solve_inheritance() 167 TRY 149 168 { 150 169 CTimer::get("XIOS").resume(); … … 153 172 CTimer::get("XIOS").suspend(); 154 173 } 174 CATCH_DUMP_STACK 155 175 156 176 /*! \brief This group of functions retrieve variable information from the configuration file (.xml) … … 165 185 */ 166 186 void cxios_get_variable_data_k8(const char* varId, int varIdSize, double* data, bool* isVarExisted) 187 TRY 167 188 { 168 189 std::string varIdStr; … … 183 204 CTimer::get("XIOS").suspend(); 184 205 } 206 CATCH_DUMP_STACK 185 207 186 208 void cxios_get_variable_data_k4(const char* varId, int varIdSize, float* data, bool* isVarExisted) 209 TRY 187 210 { 188 211 std::string varIdStr; … … 203 226 CTimer::get("XIOS").suspend(); 204 227 } 228 CATCH_DUMP_STACK 205 229 206 230 void cxios_get_variable_data_int(const char* varId, int varIdSize, int* data, bool* isVarExisted) 231 TRY 207 232 { 208 233 std::string varIdStr; … … 223 248 CTimer::get("XIOS").suspend(); 224 249 } 250 CATCH_DUMP_STACK 225 251 226 252 void cxios_get_variable_data_logic(const char* varId, int varIdSize, bool* data, bool* isVarExisted) 253 TRY 227 254 { 228 255 std::string varIdStr; … … 243 270 CTimer::get("XIOS").suspend(); 244 271 } 272 CATCH_DUMP_STACK 245 273 246 274 void cxios_get_variable_data_char(const char* varId, int varIdSize, char* data, int dataSizeIn, bool* isVarExisted) 275 TRY 247 276 { 248 277 std::string varIdStr; … … 264 293 CTimer::get("XIOS").suspend(); 265 294 } 295 CATCH_DUMP_STACK 266 296 267 297 /*! \brief This group of functions write information into existing variable in the configuration file (.xml) … … 276 306 */ 277 307 void cxios_set_variable_data_k8(const char* varId, int varIdSize, double data, bool* isVarExisted) 278 { 308 TRY 309 { 279 310 std::string varIdStr; 280 311 if (!cstr2string(varId, varIdSize, varIdStr)) return; … … 295 326 CTimer::get("XIOS").suspend(); 296 327 } 328 CATCH_DUMP_STACK 297 329 298 330 void cxios_set_variable_data_k4(const char* varId, int varIdSize, float data, bool* isVarExisted) 331 TRY 299 332 { 300 333 std::string varIdStr; … … 316 349 CTimer::get("XIOS").suspend(); 317 350 } 351 CATCH_DUMP_STACK 318 352 319 353 void cxios_set_variable_data_int(const char* varId, int varIdSize, int data, bool* isVarExisted) 354 TRY 320 355 { 321 356 std::string varIdStr; … … 338 373 CTimer::get("XIOS").suspend(); 339 374 } 375 CATCH_DUMP_STACK 340 376 341 377 void cxios_set_variable_data_logic(const char* varId, int varIdSize, bool data, bool* isVarExisted) 378 TRY 342 379 { 343 380 std::string varIdStr; … … 359 396 CTimer::get("XIOS").suspend(); 360 397 } 398 CATCH_DUMP_STACK 361 399 362 400 void cxios_set_variable_data_char(const char* varId, int varIdSize, const char* data, int dataSizeIn, bool* isVarExisted) 363 { 401 TRY 402 { 364 403 std::string varIdStr, dataStr; 365 404 if (!cstr2string(varId, varIdSize, varIdStr)) return; … … 385 424 CTimer::get("XIOS").suspend(); 386 425 } 387 426 CATCH_DUMP_STACK 388 427 389 428 // ---------------------- Ecriture des données ------------------------------ 390 429 391 430 void cxios_write_data_k80(const char* fieldid, int fieldid_size, double* data_k8, int data_Xsize) 431 TRY 392 432 { 393 433 std::string fieldid_str; … … 404 444 CTimer::get("XIOS").suspend(); 405 445 } 446 CATCH_DUMP_STACK 406 447 407 448 void cxios_write_data_k81(const char* fieldid, int fieldid_size, double* data_k8, int data_Xsize) 449 TRY 408 450 { 409 451 std::string fieldid_str; … … 423 465 CTimer::get("XIOS").suspend(); 424 466 } 467 CATCH_DUMP_STACK 425 468 426 469 void cxios_write_data_k82(const char* fieldid, int fieldid_size, double* data_k8, int data_Xsize, int data_Ysize) 470 TRY 427 471 { 428 472 std::string fieldid_str; … … 442 486 CTimer::get("XIOS").suspend(); 443 487 } 488 CATCH_DUMP_STACK 444 489 445 490 void cxios_write_data_k83(const char* fieldid, int fieldid_size, double* data_k8, int data_Xsize, int data_Ysize, int data_Zsize) 491 TRY 446 492 { 447 493 std::string fieldid_str; … … 461 507 CTimer::get("XIOS").suspend(); 462 508 } 509 CATCH_DUMP_STACK 463 510 464 511 void cxios_write_data_k84(const char* fieldid, int fieldid_size, double* data_k8, int data_0size, int data_1size, int data_2size, int data_3size) 512 TRY 465 513 { 466 514 std::string fieldid_str; … … 480 528 CTimer::get("XIOS").suspend(); 481 529 } 530 CATCH_DUMP_STACK 482 531 483 532 void cxios_write_data_k85(const char* fieldid, int fieldid_size, double* data_k8, 484 533 int data_0size, int data_1size, int data_2size, 485 534 int data_3size, int data_4size) 535 TRY 486 536 { 487 537 std::string fieldid_str; … … 501 551 CTimer::get("XIOS").suspend(); 502 552 } 553 CATCH_DUMP_STACK 503 554 504 555 void cxios_write_data_k86(const char* fieldid, int fieldid_size, double* data_k8, 505 556 int data_0size, int data_1size, int data_2size, 506 557 int data_3size, int data_4size, int data_5size) 558 TRY 507 559 { 508 560 std::string fieldid_str; … … 522 574 CTimer::get("XIOS").suspend(); 523 575 } 576 CATCH_DUMP_STACK 524 577 525 578 void cxios_write_data_k87(const char* fieldid, int fieldid_size, double* data_k8, … … 527 580 int data_3size, int data_4size, int data_5size, 528 581 int data_6size) 582 TRY 529 583 { 530 584 std::string fieldid_str; … … 544 598 CTimer::get("XIOS").suspend(); 545 599 } 600 CATCH_DUMP_STACK 546 601 547 602 void cxios_write_data_k40(const char* fieldid, int fieldid_size, float* data_k4, int data_Xsize) 603 TRY 548 604 { 549 605 std::string fieldid_str; … … 563 619 CTimer::get("XIOS").suspend(); 564 620 } 621 CATCH_DUMP_STACK 565 622 566 623 void cxios_write_data_k41(const char* fieldid, int fieldid_size, float* data_k4, int data_Xsize) 624 TRY 567 625 { 568 626 std::string fieldid_str; … … 584 642 CTimer::get("XIOS").suspend(); 585 643 } 644 CATCH_DUMP_STACK 586 645 587 646 void cxios_write_data_k42(const char* fieldid, int fieldid_size, float* data_k4, int data_Xsize, int data_Ysize) 647 TRY 588 648 { 589 649 std::string fieldid_str; … … 605 665 CTimer::get("XIOS").suspend(); 606 666 } 667 CATCH_DUMP_STACK 607 668 608 669 void cxios_write_data_k43(const char* fieldid, int fieldid_size, float* data_k4, int data_Xsize, int data_Ysize, int data_Zsize) 670 TRY 609 671 { 610 672 std::string fieldid_str; … … 626 688 CTimer::get("XIOS").suspend(); 627 689 } 690 CATCH_DUMP_STACK 628 691 629 692 void cxios_write_data_k44(const char* fieldid, int fieldid_size, float* data_k4, 630 693 int data_0size, int data_1size, int data_2size, 631 694 int data_3size) 695 TRY 632 696 { 633 697 std::string fieldid_str; … … 649 713 CTimer::get("XIOS").suspend(); 650 714 } 715 CATCH_DUMP_STACK 651 716 652 717 void cxios_write_data_k45(const char* fieldid, int fieldid_size, float* data_k4, 653 718 int data_0size, int data_1size, int data_2size, 654 719 int data_3size, int data_4size) 720 TRY 655 721 { 656 722 std::string fieldid_str; … … 672 738 CTimer::get("XIOS").suspend(); 673 739 } 740 CATCH_DUMP_STACK 674 741 675 742 void cxios_write_data_k46(const char* fieldid, int fieldid_size, float* data_k4, 676 743 int data_0size, int data_1size, int data_2size, 677 744 int data_3size, int data_4size, int data_5size) 745 TRY 678 746 { 679 747 std::string fieldid_str; … … 695 763 CTimer::get("XIOS").suspend(); 696 764 } 765 CATCH_DUMP_STACK 697 766 698 767 void cxios_write_data_k47(const char* fieldid, int fieldid_size, float* data_k4, … … 700 769 int data_3size, int data_4size, int data_5size, 701 770 int data_6size) 771 TRY 702 772 { 703 773 std::string fieldid_str; … … 719 789 CTimer::get("XIOS").suspend(); 720 790 } 791 CATCH_DUMP_STACK 721 792 722 793 // ---------------------- Lecture des données ------------------------------ 723 794 724 795 void cxios_read_data_k80(const char* fieldid, int fieldid_size, double* data_k8, int data_Xsize) 796 TRY 725 797 { 726 798 std::string fieldid_str; … … 740 812 CTimer::get("XIOS").suspend(); 741 813 } 814 CATCH_DUMP_STACK 742 815 743 816 void cxios_read_data_k81(const char* fieldid, int fieldid_size, double* data_k8, int data_Xsize) 817 TRY 744 818 { 745 819 std::string fieldid_str; … … 759 833 CTimer::get("XIOS").suspend(); 760 834 } 835 CATCH_DUMP_STACK 761 836 762 837 void cxios_read_data_k82(const char* fieldid, int fieldid_size, double* data_k8, int data_Xsize, int data_Ysize) 838 TRY 763 839 { 764 840 std::string fieldid_str; … … 778 854 CTimer::get("XIOS").suspend(); 779 855 } 856 CATCH_DUMP_STACK 780 857 781 858 void cxios_read_data_k83(const char* fieldid, int fieldid_size, double* data_k8, int data_Xsize, int data_Ysize, int data_Zsize) 859 TRY 782 860 { 783 861 std::string fieldid_str; … … 797 875 CTimer::get("XIOS").suspend(); 798 876 } 877 CATCH_DUMP_STACK 799 878 800 879 void cxios_read_data_k84(const char* fieldid, int fieldid_size, double* data_k8, 801 880 int data_0size, int data_1size, int data_2size, 802 881 int data_3size) 882 TRY 803 883 { 804 884 std::string fieldid_str; … … 818 898 CTimer::get("XIOS").suspend(); 819 899 } 900 CATCH_DUMP_STACK 820 901 821 902 void cxios_read_data_k85(const char* fieldid, int fieldid_size, double* data_k8, 822 903 int data_0size, int data_1size, int data_2size, 823 904 int data_3size, int data_4size) 905 TRY 824 906 { 825 907 std::string fieldid_str; … … 839 921 CTimer::get("XIOS").suspend(); 840 922 } 923 CATCH_DUMP_STACK 841 924 842 925 void cxios_read_data_k86(const char* fieldid, int fieldid_size, double* data_k8, 843 926 int data_0size, int data_1size, int data_2size, 844 927 int data_3size, int data_4size, int data_5size) 928 TRY 845 929 { 846 930 std::string fieldid_str; … … 860 944 CTimer::get("XIOS").suspend(); 861 945 } 946 CATCH_DUMP_STACK 862 947 863 948 void cxios_read_data_k87(const char* fieldid, int fieldid_size, double* data_k8, … … 865 950 int data_3size, int data_4size, int data_5size, 866 951 int data_6size) 952 TRY 867 953 { 868 954 std::string fieldid_str; … … 882 968 CTimer::get("XIOS").suspend(); 883 969 } 970 CATCH_DUMP_STACK 884 971 885 972 void cxios_read_data_k40(const char* fieldid, int fieldid_size, float* data_k4, int data_Xsize) 973 TRY 886 974 { 887 975 std::string fieldid_str; … … 903 991 CTimer::get("XIOS").suspend(); 904 992 } 993 CATCH_DUMP_STACK 905 994 906 995 void cxios_read_data_k41(const char* fieldid, int fieldid_size, float* data_k4, int data_Xsize) 996 TRY 907 997 { 908 998 std::string fieldid_str; … … 924 1014 CTimer::get("XIOS").suspend(); 925 1015 } 1016 CATCH_DUMP_STACK 926 1017 927 1018 void cxios_read_data_k42(const char* fieldid, int fieldid_size, float* data_k4, int data_Xsize, int data_Ysize) 1019 TRY 928 1020 { 929 1021 std::string fieldid_str; … … 945 1037 CTimer::get("XIOS").suspend(); 946 1038 } 1039 CATCH_DUMP_STACK 947 1040 948 1041 void cxios_read_data_k43(const char* fieldid, int fieldid_size, float* data_k4, int data_Xsize, int data_Ysize, int data_Zsize) 1042 TRY 949 1043 { 950 1044 std::string fieldid_str; … … 966 1060 CTimer::get("XIOS").suspend(); 967 1061 } 1062 CATCH_DUMP_STACK 968 1063 969 1064 void cxios_read_data_k44(const char* fieldid, int fieldid_size, float* data_k4, 970 1065 int data_0size, int data_1size, int data_2size, 971 1066 int data_3size) 1067 TRY 972 1068 { 973 1069 std::string fieldid_str; … … 989 1085 CTimer::get("XIOS").suspend(); 990 1086 } 1087 CATCH_DUMP_STACK 991 1088 992 1089 void cxios_read_data_k45(const char* fieldid, int fieldid_size, float* data_k4, 993 1090 int data_0size, int data_1size, int data_2size, 994 1091 int data_3size, int data_4size) 1092 TRY 995 1093 { 996 1094 std::string fieldid_str; … … 1012 1110 CTimer::get("XIOS").suspend(); 1013 1111 } 1112 CATCH_DUMP_STACK 1014 1113 1015 1114 void cxios_read_data_k46(const char* fieldid, int fieldid_size, float* data_k4, 1016 1115 int data_0size, int data_1size, int data_2size, 1017 1116 int data_3size, int data_4size, int data_5size) 1117 TRY 1018 1118 { 1019 1119 std::string fieldid_str; … … 1035 1135 CTimer::get("XIOS").suspend(); 1036 1136 } 1137 CATCH_DUMP_STACK 1037 1138 1038 1139 void cxios_read_data_k47(const char* fieldid, int fieldid_size, float* data_k4, … … 1040 1141 int data_3size, int data_4size, int data_5size, 1041 1142 int data_6size) 1143 TRY 1042 1144 { 1043 1145 std::string fieldid_str; … … 1059 1161 CTimer::get("XIOS").suspend(); 1060 1162 } 1163 CATCH_DUMP_STACK 1061 1164 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/icdate.cpp
r1542 r1646 35 35 { 36 36 long long int cxios_date_convert_to_seconds(cxios_date date_c) 37 TRY 37 38 { 38 39 xios::CDate date = xios::CDate(getCalendar("long long int cxios_date_convert_to_seconds(cxios_date date_c)"), … … 41 42 return date; 42 43 } 44 CATCH_DUMP_STACK 43 45 44 46 void cxios_date_convert_to_string(cxios_date date_c, char* str, int str_size) 47 TRY 45 48 { 46 49 xios::CDate date = xios::CDate(getCalendar("void cxios_date_convert_to_string(cxios_date date_c, char* str, int str_size)"), … … 51 54 ERROR("void cxios_date_convert_to_string(cxios_date date_c, char* str, int str_size)", << "Input string is too short"); 52 55 } 56 CATCH_DUMP_STACK 53 57 54 58 cxios_date cxios_date_convert_from_string(const char* str, int str_size) 59 TRY 55 60 { 56 61 std::string date_str; … … 63 68 return { date.getYear(), date.getMonth(), date.getDay(), date.getHour(), date.getMinute(), date.getSecond() }; 64 69 } 70 CATCH_DUMP_STACK 65 71 66 72 cxios_date cxios_date_add_duration(cxios_date date_c, cxios_duration dur_c) 73 TRY 67 74 { 68 75 xios::CDate date = xios::CDate(getCalendar("cxios_date cxios_date_add_duration(cxios_date date_c, cxios_duration dur_c)"), … … 73 80 return { res.getYear(), res.getMonth(), res.getDay(), res.getHour(), res.getMinute(), res.getSecond() }; 74 81 } 82 CATCH_DUMP_STACK 75 83 76 84 cxios_date cxios_date_sub_duration(cxios_date date_c, cxios_duration dur_c) 85 TRY 77 86 { 78 87 xios::CDate date = xios::CDate(getCalendar("cxios_date cxios_date_sub_duration(cxios_date date_c, cxios_duration dur_c)"), … … 84 93 return { res.getYear(), res.getMonth(), res.getDay(), res.getHour(), res.getMinute(), res.getSecond() }; 85 94 } 95 CATCH_DUMP_STACK 86 96 87 97 cxios_duration cxios_date_sub(cxios_date date1_c, cxios_date date2_c) 98 TRY 88 99 { 89 100 xios::CDate date1 = xios::CDate(getCalendar("cxios_duration cxios_date_sub(cxios_date date1_c, cxios_date date2_c)"), … … 96 107 return { res.year, res.month, res.day, res.hour, res.minute, res.second, res.timestep }; 97 108 } 109 CATCH_DUMP_STACK 98 110 99 111 bool cxios_date_eq(cxios_date date1_c, cxios_date date2_c) 112 TRY 100 113 { 101 114 xios::CDate date1 = xios::CDate(getCalendar("bool cxios_date_eq(cxios_date date1_c, cxios_date date2_c)"), … … 107 120 return (date1 == date2); 108 121 } 122 CATCH_DUMP_STACK 109 123 110 124 bool cxios_date_neq(cxios_date date1_c, cxios_date date2_c) 125 TRY 111 126 { 112 127 xios::CDate date1 = xios::CDate(getCalendar("bool cxios_date_eq(cxios_date date1_c, cxios_date date2_c)"), … … 118 133 return (date1 != date2); 119 134 } 135 CATCH_DUMP_STACK 120 136 121 137 bool cxios_date_lt(cxios_date date1_c, cxios_date date2_c) 138 TRY 122 139 { 123 140 xios::CDate date1 = xios::CDate(getCalendar("bool cxios_date_eq(cxios_date date1_c, cxios_date date2_c)"), … … 129 146 return (date1 < date2); 130 147 } 148 CATCH_DUMP_STACK 131 149 132 150 bool cxios_date_le(cxios_date date1_c, cxios_date date2_c) 151 TRY 133 152 { 134 153 xios::CDate date1 = xios::CDate(getCalendar("bool cxios_date_eq(cxios_date date1_c, cxios_date date2_c)"), … … 140 159 return (date1 <= date2); 141 160 } 161 CATCH_DUMP_STACK 142 162 143 163 bool cxios_date_gt(cxios_date date1_c, cxios_date date2_c) 164 TRY 144 165 { 145 166 xios::CDate date1 = xios::CDate(getCalendar("bool cxios_date_eq(cxios_date date1_c, cxios_date date2_c)"), … … 151 172 return (date1 > date2); 152 173 } 174 CATCH_DUMP_STACK 153 175 154 176 bool cxios_date_ge(cxios_date date1_c, cxios_date date2_c) 177 TRY 155 178 { 156 179 xios::CDate date1 = xios::CDate(getCalendar("bool cxios_date_eq(cxios_date date1_c, cxios_date date2_c)"), … … 162 185 return (date1 >= date2); 163 186 } 187 CATCH_DUMP_STACK 164 188 165 189 int cxios_date_get_second_of_year(cxios_date date_c) 190 TRY 166 191 { 167 192 xios::CDate date = xios::CDate(getCalendar("int cxios_date_get_second_of_year(cxios_date date_c)"), … … 170 195 return date.getSecondOfYear(); 171 196 } 197 CATCH_DUMP_STACK 172 198 173 199 double cxios_date_get_day_of_year(cxios_date date_c) 200 TRY 174 201 { 175 202 xios::CDate date = xios::CDate(getCalendar("int cxios_date_get_day_of_year(cxios_date date_c)"), … … 178 205 return date.getDayOfYear(); 179 206 } 207 CATCH_DUMP_STACK 180 208 181 209 double cxios_date_get_fraction_of_year(cxios_date date_c) 210 TRY 182 211 { 183 212 xios::CDate date = xios::CDate(getCalendar("int cxios_date_get_fraction_of_year(cxios_date date_c)"), … … 186 215 return date.getFractionOfYear(); 187 216 } 217 CATCH_DUMP_STACK 188 218 189 219 int cxios_date_get_second_of_day(cxios_date date_c) 220 TRY 190 221 { 191 222 xios::CDate date = xios::CDate(getCalendar("int cxios_date_get_second_of_day(cxios_date date_c)"), … … 194 225 return date.getSecondOfDay(); 195 226 } 227 CATCH_DUMP_STACK 196 228 197 229 double cxios_date_get_fraction_of_day(cxios_date date_c) 230 TRY 198 231 { 199 232 xios::CDate date = xios::CDate(getCalendar("int cxios_date_get_fraction_of_day(cxios_date date_c)"), … … 202 235 return date.getFractionOfDay(); 203 236 } 237 CATCH_DUMP_STACK 204 238 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/icdomain.cpp
r1542 r1646 29 29 30 30 void cxios_domain_handle_create (XDomainPtr * _ret, const char * _id, int _id_len) 31 TRY 31 32 { 32 33 std::string id; … … 36 37 CTimer::get("XIOS").suspend() ; 37 38 } 39 CATCH_DUMP_STACK 38 40 39 41 void cxios_domaingroup_handle_create (XDomainGroupPtr * _ret, const char * _id, int _id_len) 42 TRY 40 43 { 41 44 std::string id; … … 46 49 CTimer::get("XIOS").suspend() ; 47 50 } 51 CATCH_DUMP_STACK 48 52 49 53 // -------------------- Vérification des identifiants ----------------------- 50 54 51 55 void cxios_domain_valid_id (bool * _ret, const char * _id, int _id_len) 56 TRY 52 57 { 53 58 std::string id; … … 58 63 CTimer::get("XIOS").suspend() ; 59 64 } 65 CATCH_DUMP_STACK 60 66 61 67 void cxios_domaingroup_valid_id (bool * _ret, const char * _id, int _id_len) 68 TRY 62 69 { 63 70 std::string id; … … 67 74 CTimer::get("XIOS").suspend() ; 68 75 } 76 CATCH_DUMP_STACK 69 77 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/icduplicate_scalar_to_axis.cpp
r1542 r1646 26 26 // ------------------------ Création des handle ----------------------------- 27 27 void cxios_duplicate_scalar_to_axis_handle_create(XDuplicateScalarToAxisPtr * _ret, const char * _id, int _id_len) 28 TRY 28 29 { 29 30 std::string id; … … 33 34 CTimer::get("XIOS").suspend() ; 34 35 } 36 CATCH_DUMP_STACK 35 37 36 38 // -------------------- Vérification des identifiants ----------------------- 37 39 void cxios_duplicate_scalar_to_axis_valid_id(bool * _ret, const char * _id, int _id_len) 40 TRY 38 41 { 39 42 std::string id; … … 44 47 CTimer::get("XIOS").suspend() ; 45 48 } 49 CATCH_DUMP_STACK 46 50 47 51 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/icduration.cpp
r1472 r1646 1 #include "xios.hpp" 2 1 3 #include "icutil.hpp" 2 4 #include "icdate.hpp" … … 6 8 { 7 9 void cxios_duration_convert_to_string(cxios_duration dur_c, char* str, int str_size) 10 TRY 8 11 { 9 12 xios::CDuration dur( dur_c.year, dur_c.month, dur_c.day, dur_c.hour, dur_c.minute, dur_c.second, dur_c.timestep ); … … 12 15 ERROR("void cxios_duration_convert_to_string(cxios_duration dur_c, char* str, int str_size)", << "Input string is too short"); 13 16 } 17 CATCH_DUMP_STACK 14 18 15 19 cxios_duration cxios_duration_convert_from_string(const char* str, int str_size) 20 TRY 16 21 { 17 22 std::string dur_str; … … 23 28 return { dur.year, dur.month, dur.day, dur.hour, dur.minute, dur.second, dur.timestep }; 24 29 } 30 CATCH_DUMP_STACK 25 31 26 32 cxios_duration cxios_duration_add(cxios_duration dur1_c, cxios_duration dur2_c) 33 TRY 27 34 { 28 35 xios::CDuration dur1( dur1_c.year, dur1_c.month, dur1_c.day, dur1_c.hour, dur1_c.minute, dur1_c.second, dur1_c.timestep ); … … 32 39 return { res.year, res.month, res.day, res.hour, res.minute, res.second, res.timestep }; 33 40 } 41 CATCH_DUMP_STACK 34 42 35 43 cxios_duration cxios_duration_sub(cxios_duration dur1_c, cxios_duration dur2_c) 44 TRY 36 45 { 37 46 xios::CDuration dur1( dur1_c.year, dur1_c.month, dur1_c.day, dur1_c.hour, dur1_c.minute, dur1_c.second, dur1_c.timestep ); … … 41 50 return { res.year, res.month, res.day, res.hour, res.minute, res.second, res.timestep }; 42 51 } 52 CATCH_DUMP_STACK 43 53 44 54 cxios_duration cxios_duration_mult(double val, cxios_duration dur_c) 55 TRY 45 56 { 46 57 xios::CDuration dur( dur_c.year, dur_c.month, dur_c.day, dur_c.hour, dur_c.minute, dur_c.second, dur_c.timestep ); … … 48 59 return { res.year, res.month, res.day, res.hour, res.minute, res.second, res.timestep }; 49 60 } 61 CATCH_DUMP_STACK 50 62 51 63 cxios_duration cxios_duration_neg(cxios_duration dur_c) 64 TRY 52 65 { 53 66 xios::CDuration dur( dur_c.year, dur_c.month, dur_c.day, dur_c.hour, dur_c.minute, dur_c.second, dur_c.timestep ); … … 55 68 return { res.year, res.month, res.day, res.hour, res.minute, res.second, res.timestep }; 56 69 } 70 CATCH_DUMP_STACK 57 71 58 72 bool cxios_duration_eq(cxios_duration dur1_c, cxios_duration dur2_c) 73 TRY 59 74 { 60 75 xios::CDuration dur1( dur1_c.year, dur1_c.month, dur1_c.day, dur1_c.hour, dur1_c.minute, dur1_c.second, dur1_c.timestep ); … … 62 77 return (dur1 == dur2); 63 78 } 79 CATCH_DUMP_STACK 64 80 65 81 bool cxios_duration_neq(cxios_duration dur1_c, cxios_duration dur2_c) 82 TRY 66 83 { 67 84 xios::CDuration dur1( dur1_c.year, dur1_c.month, dur1_c.day, dur1_c.hour, dur1_c.minute, dur1_c.second, dur1_c.timestep ); … … 69 86 return (dur1 != dur2); 70 87 } 88 CATCH_DUMP_STACK 71 89 } -
XIOS/dev/dev_trunk_omp/src/interface/c/icexpand_domain.cpp
r1542 r1646 27 27 // ------------------------ Création des handle ----------------------------- 28 28 void cxios_expand_domain_handle_create(XExpandDomainPtr * _ret, const char * _id, int _id_len) 29 TRY 29 30 { 30 31 std::string id; … … 34 35 CTimer::get("XIOS").suspend() ; 35 36 } 37 CATCH_DUMP_STACK 36 38 37 39 // -------------------- Vérification des identifiants ----------------------- 38 40 void cxios_expand_domain_valid_id(bool * _ret, const char * _id, int _id_len) 41 TRY 39 42 { 40 43 std::string id; … … 45 48 CTimer::get("XIOS").suspend() ; 46 49 } 50 CATCH_DUMP_STACK 47 51 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/icextract_to_axis.cpp
r1542 r1646 26 26 // ------------------------ Création des handle ----------------------------- 27 27 void cxios_extract_domain_to_axis_handle_create(XExtractDomainToAxisPtr * _ret, const char * _id, int _id_len) 28 TRY 28 29 { 29 30 std::string id; … … 33 34 CTimer::get("XIOS").suspend() ; 34 35 } 36 CATCH_DUMP_STACK 35 37 36 38 // -------------------- Vérification des identifiants ----------------------- 37 39 void cxios_extract_domain_to_axis_valid_id(bool * _ret, const char * _id, int _id_len) 40 TRY 38 41 { 39 42 std::string id; … … 44 47 CTimer::get("XIOS").suspend() ; 45 48 } 49 CATCH_DUMP_STACK 46 50 47 51 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/icextract_to_scalar.cpp
r1542 r1646 26 26 // ------------------------ Création des handle ----------------------------- 27 27 void cxios_extract_axis_to_scalar_handle_create(XExtractAxisToScalarPtr * _ret, const char * _id, int _id_len) 28 TRY 28 29 { 29 30 std::string id; … … 33 34 CTimer::get("XIOS").suspend() ; 34 35 } 36 CATCH_DUMP_STACK 35 37 36 38 // -------------------- Vérification des identifiants ----------------------- 37 39 void cxios_extract_axis_to_scalar_valid_id(bool * _ret, const char * _id, int _id_len) 40 TRY 38 41 { 39 42 std::string id; … … 44 47 CTimer::get("XIOS").suspend() ; 45 48 } 49 CATCH_DUMP_STACK 46 50 47 51 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/icfield.cpp
r1542 r1646 35 35 36 36 void cxios_field_handle_create (XFieldPtr * _ret, const char * _id, int _id_len) 37 TRY 37 38 { 38 39 std::string id; … … 42 43 CTimer::get("XIOS").suspend() ; 43 44 } 45 CATCH_DUMP_STACK 44 46 45 47 void cxios_fieldgroup_handle_create (XFieldGroupPtr * _ret, const char * _id, int _id_len) 48 TRY 46 49 { 47 50 std::string id; … … 51 54 CTimer::get("XIOS").suspend() ; 52 55 } 53 56 CATCH_DUMP_STACK 54 57 55 58 // -------------------- Vérification des identifiants ----------------------- 56 59 57 60 void cxios_field_valid_id (bool * _ret, const char * _id, int _id_len) 61 TRY 58 62 { 59 63 std::string id; … … 63 67 CTimer::get("XIOS").suspend() ; 64 68 } 69 CATCH_DUMP_STACK 65 70 66 71 void cxios_fieldgroup_valid_id (bool * _ret, const char * _id, int _id_len) 72 TRY 67 73 { 68 74 std::string id; … … 72 78 CTimer::get("XIOS").suspend() ; 73 79 } 80 CATCH_DUMP_STACK 74 81 75 82 // ----------------------------------------------------------------------------------------------------- … … 78 85 79 86 void cxios_field_is_active (XFieldPtr field_hdl, bool at_current_timestep, bool* ret) 87 TRY 80 88 { 81 89 CTimer::get("XIOS").resume() ; … … 83 91 CTimer::get("XIOS").suspend() ; 84 92 } 93 CATCH_DUMP_STACK 85 94 86 95 // ----------------------------------------------------------------------------------------------------- … … 88 97 // ----------------------------------------------------------------------------------------------------- 89 98 void cxios_field_get_domain_handle(XDomainPtr * domain_hdl_ret, XFieldPtr field_hdl, int domainIndex) 99 TRY 90 100 { 91 101 CTimer::get("XIOS").resume() ; … … 93 103 CTimer::get("XIOS").suspend(); 94 104 } 105 CATCH_DUMP_STACK 95 106 96 107 void cxios_field_get_axis_handle(XAxisPtr * axis_hdl_ret, XFieldPtr field_hdl, int axisIndex) 108 TRY 97 109 { 98 110 CTimer::get("XIOS").resume() ; … … 100 112 CTimer::get("XIOS").suspend(); 101 113 } 114 CATCH_DUMP_STACK 102 115 103 116 void cxios_field_get_scalar_handle(XScalarPtr * scalar_hdl_ret, XFieldPtr field_hdl, int scalarIndex) 117 TRY 104 118 { 105 119 CTimer::get("XIOS").resume() ; … … 107 121 CTimer::get("XIOS").suspend(); 108 122 } 123 CATCH_DUMP_STACK 109 124 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/icfile.cpp
r1542 r1646 28 28 29 29 void cxios_file_handle_create (XFilePtr * _ret, const char * _id, int _id_len) 30 TRY 30 31 { 31 32 std::string id; … … 35 36 CTimer::get("XIOS").suspend() ; 36 37 } 38 CATCH_DUMP_STACK 37 39 38 40 void cxios_filegroup_handle_create (XFileGroupPtr * _ret, const char * _id, int _id_len) 41 TRY 39 42 { 40 43 std::string id; … … 44 47 CTimer::get("XIOS").suspend() ; 45 48 } 49 CATCH_DUMP_STACK 46 50 47 51 // -------------------- Vérification des identifiants ----------------------- 48 52 49 53 void cxios_file_valid_id (bool * _ret, const char * _id, int _id_len) 54 TRY 50 55 { 51 56 std::string id; … … 55 60 CTimer::get("XIOS").suspend() ; 56 61 } 62 CATCH_DUMP_STACK 57 63 58 64 void cxios_filegroup_valid_id (bool * _ret, const char * _id, int _id_len) 65 TRY 59 66 { 60 67 std::string id; … … 64 71 CTimer::get("XIOS").suspend() ; 65 72 } 73 CATCH_DUMP_STACK 66 74 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/icgenerate_rectilinear_domain.cpp
r1542 r1646 27 27 // ------------------------ Création des handle ----------------------------- 28 28 void cxios_generate_rectilinear_domain_handle_create(XGenDomainPtr * _ret, const char * _id, int _id_len) 29 TRY 29 30 { 30 31 std::string id; … … 34 35 CTimer::get("XIOS").suspend() ; 35 36 } 37 CATCH_DUMP_STACK 36 38 37 39 // -------------------- Vérification des identifiants ----------------------- 38 40 void cxios_generate_rectilinear_domain_valid_id(bool * _ret, const char * _id, int _id_len) 41 TRY 39 42 { 40 43 std::string id; … … 45 48 CTimer::get("XIOS").suspend() ; 46 49 } 50 CATCH_DUMP_STACK 47 51 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/icgrid.cpp
r1542 r1646 27 27 28 28 void cxios_grid_handle_create (XGridPtr * _ret, const char * _id, int _id_len) 29 TRY 29 30 { 30 31 std::string id; … … 34 35 CTimer::get("XIOS").suspend() ; 35 36 } 37 CATCH_DUMP_STACK 36 38 37 39 void cxios_gridgroup_handle_create (XGridGroupPtr * _ret, const char * _id, int _id_len) 40 TRY 38 41 { 39 42 std::string id; … … 43 46 CTimer::get("XIOS").suspend() ; 44 47 } 48 CATCH_DUMP_STACK 45 49 46 50 // -------------------- Vérification des identifiants ----------------------- 47 51 48 52 void cxios_grid_valid_id (bool * _ret, const char * _id, int _id_len) 53 TRY 49 54 { 50 55 std::string id; … … 54 59 CTimer::get("XIOS").suspend() ; 55 60 } 61 CATCH_DUMP_STACK 56 62 57 63 void cxios_gridgroup_valid_id (bool * _ret, const char * _id, int _id_len) 64 TRY 58 65 { 59 66 std::string id; … … 63 70 CTimer::get("XIOS").suspend() ; 64 71 } 72 CATCH_DUMP_STACK 65 73 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/icinterpolate.cpp
r1542 r1646 27 27 // ------------------------ Création des handle ----------------------------- 28 28 void cxios_interpolate_domain_handle_create(XInterpolateDomainPtr * _ret, const char * _id, int _id_len) 29 TRY 29 30 { 30 31 std::string id; … … 34 35 CTimer::get("XIOS").suspend() ; 35 36 } 37 CATCH_DUMP_STACK 36 38 37 39 // -------------------- Vérification des identifiants ----------------------- 38 40 void cxios_interpolate_domain_valid_id(bool * _ret, const char * _id, int _id_len) 41 TRY 39 42 { 40 43 std::string id; … … 45 48 CTimer::get("XIOS").suspend() ; 46 49 } 50 CATCH_DUMP_STACK 47 51 48 52 // ------------------------ Création des handle ----------------------------- 49 53 void cxios_interpolate_axis_handle_create(XInterpolateAxisPtr * _ret, const char * _id, int _id_len) 54 TRY 50 55 { 51 56 std::string id; … … 55 60 CTimer::get("XIOS").suspend() ; 56 61 } 62 CATCH_DUMP_STACK 57 63 58 64 // -------------------- Vérification des identifiants ----------------------- 59 65 void cxios_interpolate_axis_valid_id(bool * _ret, const char * _id, int _id_len) 66 TRY 60 67 { 61 68 std::string id; … … 66 73 CTimer::get("XIOS").suspend() ; 67 74 } 75 CATCH_DUMP_STACK 68 76 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/icinverse_axis.cpp
r1542 r1646 27 27 // ------------------------ Création des handle ----------------------------- 28 28 void cxios_inverse_axis_handle_create(XInverseAxisPtr * _ret, const char * _id, int _id_len) 29 TRY 29 30 { 30 31 std::string id; … … 34 35 CTimer::get("XIOS").suspend() ; 35 36 } 37 CATCH_DUMP_STACK 36 38 37 39 // -------------------- Vérification des identifiants ----------------------- 38 40 void cxios_inverse_axis_valid_id(bool * _ret, const char * _id, int _id_len) 41 TRY 39 42 { 40 43 std::string id; … … 45 48 CTimer::get("XIOS").suspend() ; 46 49 } 50 CATCH_DUMP_STACK 47 51 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/icreduce_axis_to_axis.cpp
r1542 r1646 27 27 // ------------------------ Création des handle ----------------------------- 28 28 void cxios_reduce_axis_to_axis_handle_create(XReduceAxisToAxisPtr * _ret, const char * _id, int _id_len) 29 TRY 29 30 { 30 31 std::string id; … … 34 35 CTimer::get("XIOS").suspend() ; 35 36 } 37 CATCH_DUMP_STACK 36 38 37 39 // -------------------- Vérification des identifiants ----------------------- 38 40 void cxios_reduce_axis_to_axis_valid_id(bool * _ret, const char * _id, int _id_len) 41 TRY 39 42 { 40 43 std::string id; … … 45 48 CTimer::get("XIOS").suspend() ; 46 49 } 50 CATCH_DUMP_STACK 47 51 48 52 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/icreduce_scalar_to_scalar.cpp
r1542 r1646 27 27 // ------------------------ Création des handle ----------------------------- 28 28 void cxios_reduce_scalar_to_scalar_handle_create(XReduceScalarToScalarPtr * _ret, const char * _id, int _id_len) 29 TRY 29 30 { 30 31 std::string id; … … 34 35 CTimer::get("XIOS").suspend() ; 35 36 } 37 CATCH_DUMP_STACK 36 38 37 39 // -------------------- Vérification des identifiants ----------------------- 38 40 void cxios_reduce_scalar_to_scalar_valid_id(bool * _ret, const char * _id, int _id_len) 41 TRY 39 42 { 40 43 std::string id; … … 45 48 CTimer::get("XIOS").suspend() ; 46 49 } 50 CATCH_DUMP_STACK 47 51 48 52 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/icreduce_to_axis.cpp
r1542 r1646 27 27 // ------------------------ Création des handle ----------------------------- 28 28 void cxios_reduce_domain_to_axis_handle_create(XReduceDomainToAxisPtr * _ret, const char * _id, int _id_len) 29 TRY 29 30 { 30 31 std::string id; … … 34 35 CTimer::get("XIOS").suspend() ; 35 36 } 37 CATCH_DUMP_STACK 36 38 37 39 // -------------------- Vérification des identifiants ----------------------- 38 40 void cxios_reduce_domain_to_axis_valid_id(bool * _ret, const char * _id, int _id_len) 41 TRY 39 42 { 40 43 std::string id; … … 45 48 CTimer::get("XIOS").suspend() ; 46 49 } 50 CATCH_DUMP_STACK 47 51 48 52 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/icreduce_to_scalar.cpp
r1542 r1646 27 27 // ------------------------ Création des handle ----------------------------- 28 28 void cxios_reduce_axis_to_scalar_handle_create(XReduceAxisToScalarPtr * _ret, const char * _id, int _id_len) 29 TRY 29 30 { 30 31 std::string id; … … 34 35 CTimer::get("XIOS").suspend() ; 35 36 } 37 CATCH_DUMP_STACK 36 38 37 39 // -------------------- Vérification des identifiants ----------------------- 38 40 void cxios_reduce_axis_to_scalar_valid_id(bool * _ret, const char * _id, int _id_len) 41 TRY 39 42 { 40 43 std::string id; … … 45 48 CTimer::get("XIOS").suspend() ; 46 49 } 50 CATCH_DUMP_STACK 47 51 48 52 void cxios_reduce_domain_to_scalar_handle_create(XReduceDomainToScalarPtr * _ret, const char * _id, int _id_len) 53 TRY 49 54 { 50 55 std::string id; … … 54 59 CTimer::get("XIOS").suspend() ; 55 60 } 61 CATCH_DUMP_STACK 56 62 57 63 // -------------------- Vérification des identifiants ----------------------- 58 64 void cxios_reduce_domain_to_scalar_valid_id(bool * _ret, const char * _id, int _id_len) 65 TRY 59 66 { 60 67 std::string id; … … 65 72 CTimer::get("XIOS").suspend() ; 66 73 } 74 CATCH_DUMP_STACK 67 75 68 76 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/icreorder_domain.cpp
r1542 r1646 27 27 // ------------------------ Création des handle ----------------------------- 28 28 void cxios_reorder_domain_handle_create(XReorderDomainPtr * _ret, const char * _id, int _id_len) 29 TRY 29 30 { 30 31 std::string id; … … 34 35 CTimer::get("XIOS").suspend() ; 35 36 } 37 CATCH_DUMP_STACK 36 38 37 39 // -------------------- Vérification des identifiants ----------------------- 38 40 void cxios_reorder_domain_valid_id(bool * _ret, const char * _id, int _id_len) 41 TRY 39 42 { 40 43 std::string id; … … 45 48 CTimer::get("XIOS").suspend() ; 46 49 } 50 CATCH_DUMP_STACK 47 51 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/icscalar.cpp
r1542 r1646 28 28 29 29 void cxios_scalar_handle_create (XScalarPtr * _ret, const char * _id, int _id_len) 30 TRY 30 31 { 31 32 std::string id; … … 35 36 CTimer::get("XIOS").suspend() ; 36 37 } 38 CATCH_DUMP_STACK 37 39 38 40 void cxios_scalargroup_handle_create (XScalarGroupPtr * _ret, const char * _id, int _id_len) 41 TRY 39 42 { 40 43 std::string id; … … 44 47 CTimer::get("XIOS").suspend() ; 45 48 } 49 CATCH_DUMP_STACK 46 50 47 51 // -------------------- Vérification des identifiants ----------------------- 48 52 49 53 void cxios_scalar_valid_id (bool * _ret, const char * _id, int _id_len) 54 TRY 50 55 { 51 56 std::string id; … … 56 61 CTimer::get("XIOS").suspend() ; 57 62 } 63 CATCH_DUMP_STACK 58 64 59 65 void cxios_scalargroup_valid_id (bool * _ret, const char * _id, int _id_len) 66 TRY 60 67 { 61 68 std::string id; … … 67 74 68 75 } 76 CATCH_DUMP_STACK 69 77 70 78 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/ictemporal_splitting.cpp
r1542 r1646 27 27 // ------------------------ Création des handle ----------------------------- 28 28 void cxios_temporal_splitting_handle_create(XTemporalSplittingPtr * _ret, const char * _id, int _id_len) 29 TRY 29 30 { 30 31 std::string id; … … 34 35 CTimer::get("XIOS").suspend() ; 35 36 } 37 CATCH_DUMP_STACK 36 38 37 39 // -------------------- Vérification des identifiants ----------------------- 38 40 void cxios_temporal_splitting_valid_id(bool * _ret, const char * _id, int _id_len) 41 TRY 39 42 { 40 43 std::string id; … … 45 48 CTimer::get("XIOS").suspend() ; 46 49 } 50 CATCH_DUMP_STACK 47 51 48 52 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/icvariable.cpp
r1542 r1646 29 29 30 30 void cxios_variable_handle_create (XVariablePtr * _ret, const char * _id, int _id_len) 31 TRY 31 32 { 32 33 std::string id; … … 36 37 CTimer::get("XIOS").suspend() ; 37 38 } 39 CATCH_DUMP_STACK 38 40 39 41 void cxios_variablegroup_handle_create (XVariableGroupPtr * _ret, const char * _id, int _id_len) 42 TRY 40 43 { 41 44 std::string id; … … 45 48 CTimer::get("XIOS").suspend() ; 46 49 } 50 CATCH_DUMP_STACK 47 51 48 52 // -------------------- Vérification des identifiants ----------------------- 49 53 50 54 void cxios_variable_valid_id (bool * _ret, const char * _id, int _id_len) 55 TRY 51 56 { 52 57 std::string id; … … 57 62 CTimer::get("XIOS").suspend() ; 58 63 } 64 CATCH_DUMP_STACK 59 65 60 66 void cxios_variablegroup_valid_id (bool * _ret, const char * _id, int _id_len) 67 TRY 61 68 { 62 69 std::string id; … … 68 75 69 76 } 77 CATCH_DUMP_STACK 70 78 71 79 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/iczoom.cpp
r1542 r1646 28 28 // ------------------------ Création des handle ----------------------------- 29 29 void cxios_zoom_axis_handle_create (XZoomAxisPtr * _ret, const char * _id, int _id_len) 30 TRY 30 31 { 31 32 std::string id; … … 35 36 CTimer::get("XIOS").suspend() ; 36 37 } 38 CATCH_DUMP_STACK 37 39 38 40 // -------------------- Vérification des identifiants ----------------------- 39 41 void cxios_zoom_axis_valid_id (bool * _ret, const char * _id, int _id_len) 42 TRY 40 43 { 41 44 std::string id; … … 46 49 CTimer::get("XIOS").suspend() ; 47 50 } 51 CATCH_DUMP_STACK 48 52 49 53 // ------------------------ Création des handle ----------------------------- 50 54 void cxios_zoom_domain_handle_create(XZoomDomainPtr * _ret, const char * _id, int _id_len) 55 TRY 51 56 { 52 57 std::string id; … … 56 61 CTimer::get("XIOS").suspend() ; 57 62 } 63 CATCH_DUMP_STACK 58 64 59 65 // -------------------- Vérification des identifiants ----------------------- 60 66 void cxios_zoom_domain_valid_id(bool * _ret, const char * _id, int _id_len) 67 TRY 61 68 { 62 69 std::string id; … … 67 74 CTimer::get("XIOS").suspend() ; 68 75 } 76 CATCH_DUMP_STACK 69 77 } // extern "C" -
XIOS/dev/dev_trunk_omp/src/interface/c/oasis_cinterface.cpp
r1601 r1646 1 1 #include "oasis_cinterface.hpp" 2 2 #include <string> 3 #ifdef _usingEP 3 4 using namespace ep_lib; 5 #endif 4 6 5 7 namespace xios -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icaxis_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icaxisgroup_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/iccalendar_wrapper_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/iccompute_connectivity_domain_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/iccontext_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icdomain_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" … … 952 951 953 952 953 void cxios_set_domain_radius(domain_Ptr domain_hdl, double radius) 954 { 955 CTimer::get("XIOS").resume(); 956 domain_hdl->radius.setValue(radius); 957 CTimer::get("XIOS").suspend(); 958 } 959 960 void cxios_get_domain_radius(domain_Ptr domain_hdl, double* radius) 961 { 962 CTimer::get("XIOS").resume(); 963 *radius = domain_hdl->radius.getInheritedValue(); 964 CTimer::get("XIOS").suspend(); 965 } 966 967 bool cxios_is_defined_domain_radius(domain_Ptr domain_hdl) 968 { 969 CTimer::get("XIOS").resume(); 970 bool isDefined = domain_hdl->radius.hasInheritedValue(); 971 CTimer::get("XIOS").suspend(); 972 return isDefined; 973 } 974 975 954 976 void cxios_set_domain_standard_name(domain_Ptr domain_hdl, const char * standard_name, int standard_name_size) 955 977 { -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icdomaingroup_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" … … 978 977 979 978 979 void cxios_set_domaingroup_radius(domaingroup_Ptr domaingroup_hdl, double radius) 980 { 981 CTimer::get("XIOS").resume(); 982 domaingroup_hdl->radius.setValue(radius); 983 CTimer::get("XIOS").suspend(); 984 } 985 986 void cxios_get_domaingroup_radius(domaingroup_Ptr domaingroup_hdl, double* radius) 987 { 988 CTimer::get("XIOS").resume(); 989 *radius = domaingroup_hdl->radius.getInheritedValue(); 990 CTimer::get("XIOS").suspend(); 991 } 992 993 bool cxios_is_defined_domaingroup_radius(domaingroup_Ptr domaingroup_hdl) 994 { 995 CTimer::get("XIOS").resume(); 996 bool isDefined = domaingroup_hdl->radius.hasInheritedValue(); 997 CTimer::get("XIOS").suspend(); 998 return isDefined; 999 } 1000 1001 980 1002 void cxios_set_domaingroup_standard_name(domaingroup_Ptr domaingroup_hdl, const char * standard_name, int standard_name_size) 981 1003 { -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icduplicate_scalar_to_axis_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icexpand_domain_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icextract_axis_to_scalar_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icextract_domain_to_axis_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icfield_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icfieldgroup_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icfile_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icfilegroup_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icgenerate_rectilinear_domain_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icgrid_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icgridgroup_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icinterpolate_axis_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icinterpolate_domain_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" … … 162 161 163 162 163 void cxios_set_interpolate_domain_use_area(interpolate_domain_Ptr interpolate_domain_hdl, bool use_area) 164 { 165 CTimer::get("XIOS").resume(); 166 interpolate_domain_hdl->use_area.setValue(use_area); 167 CTimer::get("XIOS").suspend(); 168 } 169 170 void cxios_get_interpolate_domain_use_area(interpolate_domain_Ptr interpolate_domain_hdl, bool* use_area) 171 { 172 CTimer::get("XIOS").resume(); 173 *use_area = interpolate_domain_hdl->use_area.getInheritedValue(); 174 CTimer::get("XIOS").suspend(); 175 } 176 177 bool cxios_is_defined_interpolate_domain_use_area(interpolate_domain_Ptr interpolate_domain_hdl) 178 { 179 CTimer::get("XIOS").resume(); 180 bool isDefined = interpolate_domain_hdl->use_area.hasInheritedValue(); 181 CTimer::get("XIOS").suspend(); 182 return isDefined; 183 } 184 185 164 186 void cxios_set_interpolate_domain_weight_filename(interpolate_domain_Ptr interpolate_domain_hdl, const char * weight_filename, int weight_filename_size) 165 187 { -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icinverse_axis_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icreduce_axis_to_axis_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icreduce_axis_to_scalar_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icreduce_domain_to_axis_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icreduce_domain_to_scalar_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icreduce_scalar_to_scalar_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icreorder_domain_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icscalar_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icscalargroup_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/ictemporal_splitting_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icvariable_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/icvariablegroup_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/iczoom_axis_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/c_attr/iczoom_domain_attr.cpp
r1542 r1646 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <memory>7 6 #include "xios.hpp" 8 7 #include "attribute_template.hpp" -
XIOS/dev/dev_trunk_omp/src/interface/fortran_attr/domain_interface_attr.F90
r1492 r1646 782 782 783 783 784 SUBROUTINE cxios_set_domain_radius(domain_hdl, radius) BIND(C) 785 USE ISO_C_BINDING 786 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 787 REAL (KIND=C_DOUBLE) , VALUE :: radius 788 END SUBROUTINE cxios_set_domain_radius 789 790 SUBROUTINE cxios_get_domain_radius(domain_hdl, radius) BIND(C) 791 USE ISO_C_BINDING 792 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 793 REAL (KIND=C_DOUBLE) :: radius 794 END SUBROUTINE cxios_get_domain_radius 795 796 FUNCTION cxios_is_defined_domain_radius(domain_hdl) BIND(C) 797 USE ISO_C_BINDING 798 LOGICAL(kind=C_BOOL) :: cxios_is_defined_domain_radius 799 INTEGER (kind = C_INTPTR_T), VALUE :: domain_hdl 800 END FUNCTION cxios_is_defined_domain_radius 801 802 784 803 SUBROUTINE cxios_set_domain_standard_name(domain_hdl, standard_name, standard_name_size) BIND(C) 785 804 USE ISO_C_BINDING -
XIOS/dev/dev_trunk_omp/src/interface/fortran_attr/domaingroup_interface_attr.F90
r1492 r1646 803 803 804 804 805 SUBROUTINE cxios_set_domaingroup_radius(domaingroup_hdl, radius) BIND(C) 806 USE ISO_C_BINDING 807 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 808 REAL (KIND=C_DOUBLE) , VALUE :: radius 809 END SUBROUTINE cxios_set_domaingroup_radius 810 811 SUBROUTINE cxios_get_domaingroup_radius(domaingroup_hdl, radius) BIND(C) 812 USE ISO_C_BINDING 813 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 814 REAL (KIND=C_DOUBLE) :: radius 815 END SUBROUTINE cxios_get_domaingroup_radius 816 817 FUNCTION cxios_is_defined_domaingroup_radius(domaingroup_hdl) BIND(C) 818 USE ISO_C_BINDING 819 LOGICAL(kind=C_BOOL) :: cxios_is_defined_domaingroup_radius 820 INTEGER (kind = C_INTPTR_T), VALUE :: domaingroup_hdl 821 END FUNCTION cxios_is_defined_domaingroup_radius 822 823 805 824 SUBROUTINE cxios_set_domaingroup_standard_name(domaingroup_hdl, standard_name, standard_name_size) BIND(C) 806 825 USE ISO_C_BINDING -
XIOS/dev/dev_trunk_omp/src/interface/fortran_attr/idomain_attr.F90
r1492 r1646 16 16 , data_nj, dim_i_name, dim_j_name, domain_ref, i_index, ibegin, j_index, jbegin, lat_name, latvalue_1d & 17 17 , latvalue_2d, lon_name, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo & 18 , nj, nj_glo, nvertex, prec, standard_name, type )18 , nj, nj_glo, nvertex, prec, radius, standard_name, type ) 19 19 20 20 IMPLICIT NONE … … 61 61 INTEGER , OPTIONAL, INTENT(IN) :: nvertex 62 62 INTEGER , OPTIONAL, INTENT(IN) :: prec 63 REAL (KIND=8) , OPTIONAL, INTENT(IN) :: radius 63 64 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name 64 65 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type … … 71 72 , data_nj, dim_i_name, dim_j_name, domain_ref, i_index, ibegin, j_index, jbegin, lat_name, latvalue_1d & 72 73 , latvalue_2d, lon_name, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo & 73 , nj, nj_glo, nvertex, prec, standard_name, type )74 , nj, nj_glo, nvertex, prec, radius, standard_name, type ) 74 75 75 76 END SUBROUTINE xios(set_domain_attr) … … 80 81 , data_nj, dim_i_name, dim_j_name, domain_ref, i_index, ibegin, j_index, jbegin, lat_name, latvalue_1d & 81 82 , latvalue_2d, lon_name, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo & 82 , nj, nj_glo, nvertex, prec, standard_name, type )83 , nj, nj_glo, nvertex, prec, radius, standard_name, type ) 83 84 84 85 IMPLICIT NONE … … 124 125 INTEGER , OPTIONAL, INTENT(IN) :: nvertex 125 126 INTEGER , OPTIONAL, INTENT(IN) :: prec 127 REAL (KIND=8) , OPTIONAL, INTENT(IN) :: radius 126 128 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name 127 129 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type … … 132 134 , data_nj, dim_i_name, dim_j_name, domain_ref, i_index, ibegin, j_index, jbegin, lat_name, latvalue_1d & 133 135 , latvalue_2d, lon_name, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo & 134 , nj, nj_glo, nvertex, prec, standard_name, type )136 , nj, nj_glo, nvertex, prec, radius, standard_name, type ) 135 137 136 138 END SUBROUTINE xios(set_domain_attr_hdl) … … 141 143 , data_ni_, data_nj_, dim_i_name_, dim_j_name_, domain_ref_, i_index_, ibegin_, j_index_, jbegin_ & 142 144 , lat_name_, latvalue_1d_, latvalue_2d_, lon_name_, long_name_, lonvalue_1d_, lonvalue_2d_, mask_1d_ & 143 , mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, prec_, standard_name_, type_ ) 145 , mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, prec_, radius_, standard_name_, type_ & 146 ) 144 147 145 148 IMPLICIT NONE … … 185 188 INTEGER , OPTIONAL, INTENT(IN) :: nvertex_ 186 189 INTEGER , OPTIONAL, INTENT(IN) :: prec_ 190 REAL (KIND=8) , OPTIONAL, INTENT(IN) :: radius_ 187 191 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name_ 188 192 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type_ … … 382 386 ENDIF 383 387 388 IF (PRESENT(radius_)) THEN 389 CALL cxios_set_domain_radius & 390 (domain_hdl%daddr, radius_) 391 ENDIF 392 384 393 IF (PRESENT(standard_name_)) THEN 385 394 CALL cxios_set_domain_standard_name & … … 399 408 , data_nj, dim_i_name, dim_j_name, domain_ref, i_index, ibegin, j_index, jbegin, lat_name, latvalue_1d & 400 409 , latvalue_2d, lon_name, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo & 401 , nj, nj_glo, nvertex, prec, standard_name, type )410 , nj, nj_glo, nvertex, prec, radius, standard_name, type ) 402 411 403 412 IMPLICIT NONE … … 444 453 INTEGER , OPTIONAL, INTENT(OUT) :: nvertex 445 454 INTEGER , OPTIONAL, INTENT(OUT) :: prec 455 REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: radius 446 456 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name 447 457 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type … … 454 464 , data_nj, dim_i_name, dim_j_name, domain_ref, i_index, ibegin, j_index, jbegin, lat_name, latvalue_1d & 455 465 , latvalue_2d, lon_name, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo & 456 , nj, nj_glo, nvertex, prec, standard_name, type )466 , nj, nj_glo, nvertex, prec, radius, standard_name, type ) 457 467 458 468 END SUBROUTINE xios(get_domain_attr) … … 463 473 , data_nj, dim_i_name, dim_j_name, domain_ref, i_index, ibegin, j_index, jbegin, lat_name, latvalue_1d & 464 474 , latvalue_2d, lon_name, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo & 465 , nj, nj_glo, nvertex, prec, standard_name, type )475 , nj, nj_glo, nvertex, prec, radius, standard_name, type ) 466 476 467 477 IMPLICIT NONE … … 507 517 INTEGER , OPTIONAL, INTENT(OUT) :: nvertex 508 518 INTEGER , OPTIONAL, INTENT(OUT) :: prec 519 REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: radius 509 520 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name 510 521 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type … … 515 526 , data_nj, dim_i_name, dim_j_name, domain_ref, i_index, ibegin, j_index, jbegin, lat_name, latvalue_1d & 516 527 , latvalue_2d, lon_name, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo & 517 , nj, nj_glo, nvertex, prec, standard_name, type )528 , nj, nj_glo, nvertex, prec, radius, standard_name, type ) 518 529 519 530 END SUBROUTINE xios(get_domain_attr_hdl) … … 524 535 , data_ni_, data_nj_, dim_i_name_, dim_j_name_, domain_ref_, i_index_, ibegin_, j_index_, jbegin_ & 525 536 , lat_name_, latvalue_1d_, latvalue_2d_, lon_name_, long_name_, lonvalue_1d_, lonvalue_2d_, mask_1d_ & 526 , mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, prec_, standard_name_, type_ ) 537 , mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, prec_, radius_, standard_name_, type_ & 538 ) 527 539 528 540 IMPLICIT NONE … … 568 580 INTEGER , OPTIONAL, INTENT(OUT) :: nvertex_ 569 581 INTEGER , OPTIONAL, INTENT(OUT) :: prec_ 582 REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: radius_ 570 583 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name_ 571 584 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type_ … … 765 778 ENDIF 766 779 780 IF (PRESENT(radius_)) THEN 781 CALL cxios_get_domain_radius & 782 (domain_hdl%daddr, radius_) 783 ENDIF 784 767 785 IF (PRESENT(standard_name_)) THEN 768 786 CALL cxios_get_domain_standard_name & … … 782 800 , data_nj, dim_i_name, dim_j_name, domain_ref, i_index, ibegin, j_index, jbegin, lat_name, latvalue_1d & 783 801 , latvalue_2d, lon_name, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo & 784 , nj, nj_glo, nvertex, prec, standard_name, type )802 , nj, nj_glo, nvertex, prec, radius, standard_name, type ) 785 803 786 804 IMPLICIT NONE … … 863 881 LOGICAL, OPTIONAL, INTENT(OUT) :: prec 864 882 LOGICAL(KIND=C_BOOL) :: prec_tmp 883 LOGICAL, OPTIONAL, INTENT(OUT) :: radius 884 LOGICAL(KIND=C_BOOL) :: radius_tmp 865 885 LOGICAL, OPTIONAL, INTENT(OUT) :: standard_name 866 886 LOGICAL(KIND=C_BOOL) :: standard_name_tmp … … 875 895 , data_nj, dim_i_name, dim_j_name, domain_ref, i_index, ibegin, j_index, jbegin, lat_name, latvalue_1d & 876 896 , latvalue_2d, lon_name, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo & 877 , nj, nj_glo, nvertex, prec, standard_name, type )897 , nj, nj_glo, nvertex, prec, radius, standard_name, type ) 878 898 879 899 END SUBROUTINE xios(is_defined_domain_attr) … … 884 904 , data_nj, dim_i_name, dim_j_name, domain_ref, i_index, ibegin, j_index, jbegin, lat_name, latvalue_1d & 885 905 , latvalue_2d, lon_name, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo & 886 , nj, nj_glo, nvertex, prec, standard_name, type )906 , nj, nj_glo, nvertex, prec, radius, standard_name, type ) 887 907 888 908 IMPLICIT NONE … … 964 984 LOGICAL, OPTIONAL, INTENT(OUT) :: prec 965 985 LOGICAL(KIND=C_BOOL) :: prec_tmp 986 LOGICAL, OPTIONAL, INTENT(OUT) :: radius 987 LOGICAL(KIND=C_BOOL) :: radius_tmp 966 988 LOGICAL, OPTIONAL, INTENT(OUT) :: standard_name 967 989 LOGICAL(KIND=C_BOOL) :: standard_name_tmp … … 974 996 , data_nj, dim_i_name, dim_j_name, domain_ref, i_index, ibegin, j_index, jbegin, lat_name, latvalue_1d & 975 997 , latvalue_2d, lon_name, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d, name, ni, ni_glo & 976 , nj, nj_glo, nvertex, prec, standard_name, type )998 , nj, nj_glo, nvertex, prec, radius, standard_name, type ) 977 999 978 1000 END SUBROUTINE xios(is_defined_domain_attr_hdl) … … 983 1005 , data_ni_, data_nj_, dim_i_name_, dim_j_name_, domain_ref_, i_index_, ibegin_, j_index_, jbegin_ & 984 1006 , lat_name_, latvalue_1d_, latvalue_2d_, lon_name_, long_name_, lonvalue_1d_, lonvalue_2d_, mask_1d_ & 985 , mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, prec_, standard_name_, type_ ) 1007 , mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, prec_, radius_, standard_name_, type_ & 1008 ) 986 1009 987 1010 IMPLICIT NONE … … 1063 1086 LOGICAL, OPTIONAL, INTENT(OUT) :: prec_ 1064 1087 LOGICAL(KIND=C_BOOL) :: prec__tmp 1088 LOGICAL, OPTIONAL, INTENT(OUT) :: radius_ 1089 LOGICAL(KIND=C_BOOL) :: radius__tmp 1065 1090 LOGICAL, OPTIONAL, INTENT(OUT) :: standard_name_ 1066 1091 LOGICAL(KIND=C_BOOL) :: standard_name__tmp … … 1296 1321 ENDIF 1297 1322 1323 IF (PRESENT(radius_)) THEN 1324 radius__tmp = cxios_is_defined_domain_radius & 1325 (domain_hdl%daddr) 1326 radius_ = radius__tmp 1327 ENDIF 1328 1298 1329 IF (PRESENT(standard_name_)) THEN 1299 1330 standard_name__tmp = cxios_is_defined_domain_standard_name & -
XIOS/dev/dev_trunk_omp/src/interface/fortran_attr/idomaingroup_attr.F90
r1492 r1646 16 16 , data_nj, dim_i_name, dim_j_name, domain_ref, group_ref, i_index, ibegin, j_index, jbegin, lat_name & 17 17 , latvalue_1d, latvalue_2d, lon_name, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d & 18 , name, ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type )18 , name, ni, ni_glo, nj, nj_glo, nvertex, prec, radius, standard_name, type ) 19 19 20 20 IMPLICIT NONE … … 62 62 INTEGER , OPTIONAL, INTENT(IN) :: nvertex 63 63 INTEGER , OPTIONAL, INTENT(IN) :: prec 64 REAL (KIND=8) , OPTIONAL, INTENT(IN) :: radius 64 65 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name 65 66 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type … … 72 73 , data_nj, dim_i_name, dim_j_name, domain_ref, group_ref, i_index, ibegin, j_index, jbegin, lat_name & 73 74 , latvalue_1d, latvalue_2d, lon_name, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d & 74 , name, ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type )75 , name, ni, ni_glo, nj, nj_glo, nvertex, prec, radius, standard_name, type ) 75 76 76 77 END SUBROUTINE xios(set_domaingroup_attr) … … 81 82 , data_nj, dim_i_name, dim_j_name, domain_ref, group_ref, i_index, ibegin, j_index, jbegin, lat_name & 82 83 , latvalue_1d, latvalue_2d, lon_name, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d & 83 , name, ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type )84 , name, ni, ni_glo, nj, nj_glo, nvertex, prec, radius, standard_name, type ) 84 85 85 86 IMPLICIT NONE … … 126 127 INTEGER , OPTIONAL, INTENT(IN) :: nvertex 127 128 INTEGER , OPTIONAL, INTENT(IN) :: prec 129 REAL (KIND=8) , OPTIONAL, INTENT(IN) :: radius 128 130 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name 129 131 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type … … 134 136 , data_nj, dim_i_name, dim_j_name, domain_ref, group_ref, i_index, ibegin, j_index, jbegin, lat_name & 135 137 , latvalue_1d, latvalue_2d, lon_name, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d & 136 , name, ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type )138 , name, ni, ni_glo, nj, nj_glo, nvertex, prec, radius, standard_name, type ) 137 139 138 140 END SUBROUTINE xios(set_domaingroup_attr_hdl) … … 143 145 , data_ni_, data_nj_, dim_i_name_, dim_j_name_, domain_ref_, group_ref_, i_index_, ibegin_, j_index_ & 144 146 , jbegin_, lat_name_, latvalue_1d_, latvalue_2d_, lon_name_, long_name_, lonvalue_1d_, lonvalue_2d_ & 145 , mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, prec_, standard_name_, type_ &146 )147 , mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, prec_, radius_, standard_name_ & 148 , type_ ) 147 149 148 150 IMPLICIT NONE … … 189 191 INTEGER , OPTIONAL, INTENT(IN) :: nvertex_ 190 192 INTEGER , OPTIONAL, INTENT(IN) :: prec_ 193 REAL (KIND=8) , OPTIONAL, INTENT(IN) :: radius_ 191 194 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: standard_name_ 192 195 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type_ … … 391 394 ENDIF 392 395 396 IF (PRESENT(radius_)) THEN 397 CALL cxios_set_domaingroup_radius & 398 (domaingroup_hdl%daddr, radius_) 399 ENDIF 400 393 401 IF (PRESENT(standard_name_)) THEN 394 402 CALL cxios_set_domaingroup_standard_name & … … 408 416 , data_nj, dim_i_name, dim_j_name, domain_ref, group_ref, i_index, ibegin, j_index, jbegin, lat_name & 409 417 , latvalue_1d, latvalue_2d, lon_name, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d & 410 , name, ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type )418 , name, ni, ni_glo, nj, nj_glo, nvertex, prec, radius, standard_name, type ) 411 419 412 420 IMPLICIT NONE … … 454 462 INTEGER , OPTIONAL, INTENT(OUT) :: nvertex 455 463 INTEGER , OPTIONAL, INTENT(OUT) :: prec 464 REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: radius 456 465 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name 457 466 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type … … 464 473 , data_nj, dim_i_name, dim_j_name, domain_ref, group_ref, i_index, ibegin, j_index, jbegin, lat_name & 465 474 , latvalue_1d, latvalue_2d, lon_name, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d & 466 , name, ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type )475 , name, ni, ni_glo, nj, nj_glo, nvertex, prec, radius, standard_name, type ) 467 476 468 477 END SUBROUTINE xios(get_domaingroup_attr) … … 473 482 , data_nj, dim_i_name, dim_j_name, domain_ref, group_ref, i_index, ibegin, j_index, jbegin, lat_name & 474 483 , latvalue_1d, latvalue_2d, lon_name, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d & 475 , name, ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type )484 , name, ni, ni_glo, nj, nj_glo, nvertex, prec, radius, standard_name, type ) 476 485 477 486 IMPLICIT NONE … … 518 527 INTEGER , OPTIONAL, INTENT(OUT) :: nvertex 519 528 INTEGER , OPTIONAL, INTENT(OUT) :: prec 529 REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: radius 520 530 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name 521 531 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type … … 526 536 , data_nj, dim_i_name, dim_j_name, domain_ref, group_ref, i_index, ibegin, j_index, jbegin, lat_name & 527 537 , latvalue_1d, latvalue_2d, lon_name, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d & 528 , name, ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type )538 , name, ni, ni_glo, nj, nj_glo, nvertex, prec, radius, standard_name, type ) 529 539 530 540 END SUBROUTINE xios(get_domaingroup_attr_hdl) … … 535 545 , data_ni_, data_nj_, dim_i_name_, dim_j_name_, domain_ref_, group_ref_, i_index_, ibegin_, j_index_ & 536 546 , jbegin_, lat_name_, latvalue_1d_, latvalue_2d_, lon_name_, long_name_, lonvalue_1d_, lonvalue_2d_ & 537 , mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, prec_, standard_name_, type_ &538 )547 , mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, prec_, radius_, standard_name_ & 548 , type_ ) 539 549 540 550 IMPLICIT NONE … … 581 591 INTEGER , OPTIONAL, INTENT(OUT) :: nvertex_ 582 592 INTEGER , OPTIONAL, INTENT(OUT) :: prec_ 593 REAL (KIND=8) , OPTIONAL, INTENT(OUT) :: radius_ 583 594 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: standard_name_ 584 595 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type_ … … 783 794 ENDIF 784 795 796 IF (PRESENT(radius_)) THEN 797 CALL cxios_get_domaingroup_radius & 798 (domaingroup_hdl%daddr, radius_) 799 ENDIF 800 785 801 IF (PRESENT(standard_name_)) THEN 786 802 CALL cxios_get_domaingroup_standard_name & … … 800 816 , data_nj, dim_i_name, dim_j_name, domain_ref, group_ref, i_index, ibegin, j_index, jbegin, lat_name & 801 817 , latvalue_1d, latvalue_2d, lon_name, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d & 802 , name, ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type )818 , name, ni, ni_glo, nj, nj_glo, nvertex, prec, radius, standard_name, type ) 803 819 804 820 IMPLICIT NONE … … 883 899 LOGICAL, OPTIONAL, INTENT(OUT) :: prec 884 900 LOGICAL(KIND=C_BOOL) :: prec_tmp 901 LOGICAL, OPTIONAL, INTENT(OUT) :: radius 902 LOGICAL(KIND=C_BOOL) :: radius_tmp 885 903 LOGICAL, OPTIONAL, INTENT(OUT) :: standard_name 886 904 LOGICAL(KIND=C_BOOL) :: standard_name_tmp … … 895 913 , data_nj, dim_i_name, dim_j_name, domain_ref, group_ref, i_index, ibegin, j_index, jbegin, lat_name & 896 914 , latvalue_1d, latvalue_2d, lon_name, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d & 897 , name, ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type )915 , name, ni, ni_glo, nj, nj_glo, nvertex, prec, radius, standard_name, type ) 898 916 899 917 END SUBROUTINE xios(is_defined_domaingroup_attr) … … 904 922 , data_nj, dim_i_name, dim_j_name, domain_ref, group_ref, i_index, ibegin, j_index, jbegin, lat_name & 905 923 , latvalue_1d, latvalue_2d, lon_name, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d & 906 , name, ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type )924 , name, ni, ni_glo, nj, nj_glo, nvertex, prec, radius, standard_name, type ) 907 925 908 926 IMPLICIT NONE … … 986 1004 LOGICAL, OPTIONAL, INTENT(OUT) :: prec 987 1005 LOGICAL(KIND=C_BOOL) :: prec_tmp 1006 LOGICAL, OPTIONAL, INTENT(OUT) :: radius 1007 LOGICAL(KIND=C_BOOL) :: radius_tmp 988 1008 LOGICAL, OPTIONAL, INTENT(OUT) :: standard_name 989 1009 LOGICAL(KIND=C_BOOL) :: standard_name_tmp … … 996 1016 , data_nj, dim_i_name, dim_j_name, domain_ref, group_ref, i_index, ibegin, j_index, jbegin, lat_name & 997 1017 , latvalue_1d, latvalue_2d, lon_name, long_name, lonvalue_1d, lonvalue_2d, mask_1d, mask_2d & 998 , name, ni, ni_glo, nj, nj_glo, nvertex, prec, standard_name, type )1018 , name, ni, ni_glo, nj, nj_glo, nvertex, prec, radius, standard_name, type ) 999 1019 1000 1020 END SUBROUTINE xios(is_defined_domaingroup_attr_hdl) … … 1005 1025 , data_ni_, data_nj_, dim_i_name_, dim_j_name_, domain_ref_, group_ref_, i_index_, ibegin_, j_index_ & 1006 1026 , jbegin_, lat_name_, latvalue_1d_, latvalue_2d_, lon_name_, long_name_, lonvalue_1d_, lonvalue_2d_ & 1007 , mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, prec_, standard_name_, type_ &1008 )1027 , mask_1d_, mask_2d_, name_, ni_, ni_glo_, nj_, nj_glo_, nvertex_, prec_, radius_, standard_name_ & 1028 , type_ ) 1009 1029 1010 1030 IMPLICIT NONE … … 1088 1108 LOGICAL, OPTIONAL, INTENT(OUT) :: prec_ 1089 1109 LOGICAL(KIND=C_BOOL) :: prec__tmp 1110 LOGICAL, OPTIONAL, INTENT(OUT) :: radius_ 1111 LOGICAL(KIND=C_BOOL) :: radius__tmp 1090 1112 LOGICAL, OPTIONAL, INTENT(OUT) :: standard_name_ 1091 1113 LOGICAL(KIND=C_BOOL) :: standard_name__tmp … … 1327 1349 ENDIF 1328 1350 1351 IF (PRESENT(radius_)) THEN 1352 radius__tmp = cxios_is_defined_domaingroup_radius & 1353 (domaingroup_hdl%daddr) 1354 radius_ = radius__tmp 1355 ENDIF 1356 1329 1357 IF (PRESENT(standard_name_)) THEN 1330 1358 standard_name__tmp = cxios_is_defined_domaingroup_standard_name & -
XIOS/dev/dev_trunk_omp/src/interface/fortran_attr/iinterpolate_domain_attr.F90
r1492 r1646 13 13 SUBROUTINE xios(set_interpolate_domain_attr) & 14 14 ( interpolate_domain_id, detect_missing_value, mode, order, quantity, read_write_convention & 15 , renormalize, weight_filename, write_weight )15 , renormalize, use_area, weight_filename, write_weight ) 16 16 17 17 IMPLICIT NONE … … 27 27 LOGICAL , OPTIONAL, INTENT(IN) :: renormalize 28 28 LOGICAL (KIND=C_BOOL) :: renormalize_tmp 29 LOGICAL , OPTIONAL, INTENT(IN) :: use_area 30 LOGICAL (KIND=C_BOOL) :: use_area_tmp 29 31 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: weight_filename 30 32 LOGICAL , OPTIONAL, INTENT(IN) :: write_weight … … 35 37 CALL xios(set_interpolate_domain_attr_hdl_) & 36 38 ( interpolate_domain_hdl, detect_missing_value, mode, order, quantity, read_write_convention & 37 , renormalize, weight_filename, write_weight )39 , renormalize, use_area, weight_filename, write_weight ) 38 40 39 41 END SUBROUTINE xios(set_interpolate_domain_attr) … … 41 43 SUBROUTINE xios(set_interpolate_domain_attr_hdl) & 42 44 ( interpolate_domain_hdl, detect_missing_value, mode, order, quantity, read_write_convention & 43 , renormalize, weight_filename, write_weight )45 , renormalize, use_area, weight_filename, write_weight ) 44 46 45 47 IMPLICIT NONE … … 54 56 LOGICAL , OPTIONAL, INTENT(IN) :: renormalize 55 57 LOGICAL (KIND=C_BOOL) :: renormalize_tmp 58 LOGICAL , OPTIONAL, INTENT(IN) :: use_area 59 LOGICAL (KIND=C_BOOL) :: use_area_tmp 56 60 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: weight_filename 57 61 LOGICAL , OPTIONAL, INTENT(IN) :: write_weight … … 60 64 CALL xios(set_interpolate_domain_attr_hdl_) & 61 65 ( interpolate_domain_hdl, detect_missing_value, mode, order, quantity, read_write_convention & 62 , renormalize, weight_filename, write_weight )66 , renormalize, use_area, weight_filename, write_weight ) 63 67 64 68 END SUBROUTINE xios(set_interpolate_domain_attr_hdl) … … 66 70 SUBROUTINE xios(set_interpolate_domain_attr_hdl_) & 67 71 ( interpolate_domain_hdl, detect_missing_value_, mode_, order_, quantity_, read_write_convention_ & 68 , renormalize_, weight_filename_, write_weight_ )72 , renormalize_, use_area_, weight_filename_, write_weight_ ) 69 73 70 74 IMPLICIT NONE … … 79 83 LOGICAL , OPTIONAL, INTENT(IN) :: renormalize_ 80 84 LOGICAL (KIND=C_BOOL) :: renormalize__tmp 85 LOGICAL , OPTIONAL, INTENT(IN) :: use_area_ 86 LOGICAL (KIND=C_BOOL) :: use_area__tmp 81 87 CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: weight_filename_ 82 88 LOGICAL , OPTIONAL, INTENT(IN) :: write_weight_ … … 116 122 ENDIF 117 123 124 IF (PRESENT(use_area_)) THEN 125 use_area__tmp = use_area_ 126 CALL cxios_set_interpolate_domain_use_area & 127 (interpolate_domain_hdl%daddr, use_area__tmp) 128 ENDIF 129 118 130 IF (PRESENT(weight_filename_)) THEN 119 131 CALL cxios_set_interpolate_domain_weight_filename & … … 131 143 SUBROUTINE xios(get_interpolate_domain_attr) & 132 144 ( interpolate_domain_id, detect_missing_value, mode, order, quantity, read_write_convention & 133 , renormalize, weight_filename, write_weight )145 , renormalize, use_area, weight_filename, write_weight ) 134 146 135 147 IMPLICIT NONE … … 145 157 LOGICAL , OPTIONAL, INTENT(OUT) :: renormalize 146 158 LOGICAL (KIND=C_BOOL) :: renormalize_tmp 159 LOGICAL , OPTIONAL, INTENT(OUT) :: use_area 160 LOGICAL (KIND=C_BOOL) :: use_area_tmp 147 161 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: weight_filename 148 162 LOGICAL , OPTIONAL, INTENT(OUT) :: write_weight … … 153 167 CALL xios(get_interpolate_domain_attr_hdl_) & 154 168 ( interpolate_domain_hdl, detect_missing_value, mode, order, quantity, read_write_convention & 155 , renormalize, weight_filename, write_weight )169 , renormalize, use_area, weight_filename, write_weight ) 156 170 157 171 END SUBROUTINE xios(get_interpolate_domain_attr) … … 159 173 SUBROUTINE xios(get_interpolate_domain_attr_hdl) & 160 174 ( interpolate_domain_hdl, detect_missing_value, mode, order, quantity, read_write_convention & 161 , renormalize, weight_filename, write_weight )175 , renormalize, use_area, weight_filename, write_weight ) 162 176 163 177 IMPLICIT NONE … … 172 186 LOGICAL , OPTIONAL, INTENT(OUT) :: renormalize 173 187 LOGICAL (KIND=C_BOOL) :: renormalize_tmp 188 LOGICAL , OPTIONAL, INTENT(OUT) :: use_area 189 LOGICAL (KIND=C_BOOL) :: use_area_tmp 174 190 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: weight_filename 175 191 LOGICAL , OPTIONAL, INTENT(OUT) :: write_weight … … 178 194 CALL xios(get_interpolate_domain_attr_hdl_) & 179 195 ( interpolate_domain_hdl, detect_missing_value, mode, order, quantity, read_write_convention & 180 , renormalize, weight_filename, write_weight )196 , renormalize, use_area, weight_filename, write_weight ) 181 197 182 198 END SUBROUTINE xios(get_interpolate_domain_attr_hdl) … … 184 200 SUBROUTINE xios(get_interpolate_domain_attr_hdl_) & 185 201 ( interpolate_domain_hdl, detect_missing_value_, mode_, order_, quantity_, read_write_convention_ & 186 , renormalize_, weight_filename_, write_weight_ )202 , renormalize_, use_area_, weight_filename_, write_weight_ ) 187 203 188 204 IMPLICIT NONE … … 197 213 LOGICAL , OPTIONAL, INTENT(OUT) :: renormalize_ 198 214 LOGICAL (KIND=C_BOOL) :: renormalize__tmp 215 LOGICAL , OPTIONAL, INTENT(OUT) :: use_area_ 216 LOGICAL (KIND=C_BOOL) :: use_area__tmp 199 217 CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: weight_filename_ 200 218 LOGICAL , OPTIONAL, INTENT(OUT) :: write_weight_ … … 234 252 ENDIF 235 253 254 IF (PRESENT(use_area_)) THEN 255 CALL cxios_get_interpolate_domain_use_area & 256 (interpolate_domain_hdl%daddr, use_area__tmp) 257 use_area_ = use_area__tmp 258 ENDIF 259 236 260 IF (PRESENT(weight_filename_)) THEN 237 261 CALL cxios_get_interpolate_domain_weight_filename & … … 249 273 SUBROUTINE xios(is_defined_interpolate_domain_attr) & 250 274 ( interpolate_domain_id, detect_missing_value, mode, order, quantity, read_write_convention & 251 , renormalize, weight_filename, write_weight )275 , renormalize, use_area, weight_filename, write_weight ) 252 276 253 277 IMPLICIT NONE … … 266 290 LOGICAL, OPTIONAL, INTENT(OUT) :: renormalize 267 291 LOGICAL(KIND=C_BOOL) :: renormalize_tmp 292 LOGICAL, OPTIONAL, INTENT(OUT) :: use_area 293 LOGICAL(KIND=C_BOOL) :: use_area_tmp 268 294 LOGICAL, OPTIONAL, INTENT(OUT) :: weight_filename 269 295 LOGICAL(KIND=C_BOOL) :: weight_filename_tmp … … 275 301 CALL xios(is_defined_interpolate_domain_attr_hdl_) & 276 302 ( interpolate_domain_hdl, detect_missing_value, mode, order, quantity, read_write_convention & 277 , renormalize, weight_filename, write_weight )303 , renormalize, use_area, weight_filename, write_weight ) 278 304 279 305 END SUBROUTINE xios(is_defined_interpolate_domain_attr) … … 281 307 SUBROUTINE xios(is_defined_interpolate_domain_attr_hdl) & 282 308 ( interpolate_domain_hdl, detect_missing_value, mode, order, quantity, read_write_convention & 283 , renormalize, weight_filename, write_weight )309 , renormalize, use_area, weight_filename, write_weight ) 284 310 285 311 IMPLICIT NONE … … 297 323 LOGICAL, OPTIONAL, INTENT(OUT) :: renormalize 298 324 LOGICAL(KIND=C_BOOL) :: renormalize_tmp 325 LOGICAL, OPTIONAL, INTENT(OUT) :: use_area 326 LOGICAL(KIND=C_BOOL) :: use_area_tmp 299 327 LOGICAL, OPTIONAL, INTENT(OUT) :: weight_filename 300 328 LOGICAL(KIND=C_BOOL) :: weight_filename_tmp … … 304 332 CALL xios(is_defined_interpolate_domain_attr_hdl_) & 305 333 ( interpolate_domain_hdl, detect_missing_value, mode, order, quantity, read_write_convention & 306 , renormalize, weight_filename, write_weight )334 , renormalize, use_area, weight_filename, write_weight ) 307 335 308 336 END SUBROUTINE xios(is_defined_interpolate_domain_attr_hdl) … … 310 338 SUBROUTINE xios(is_defined_interpolate_domain_attr_hdl_) & 311 339 ( interpolate_domain_hdl, detect_missing_value_, mode_, order_, quantity_, read_write_convention_ & 312 , renormalize_, weight_filename_, write_weight_ )340 , renormalize_, use_area_, weight_filename_, write_weight_ ) 313 341 314 342 IMPLICIT NONE … … 326 354 LOGICAL, OPTIONAL, INTENT(OUT) :: renormalize_ 327 355 LOGICAL(KIND=C_BOOL) :: renormalize__tmp 356 LOGICAL, OPTIONAL, INTENT(OUT) :: use_area_ 357 LOGICAL(KIND=C_BOOL) :: use_area__tmp 328 358 LOGICAL, OPTIONAL, INTENT(OUT) :: weight_filename_ 329 359 LOGICAL(KIND=C_BOOL) :: weight_filename__tmp … … 367 397 ENDIF 368 398 399 IF (PRESENT(use_area_)) THEN 400 use_area__tmp = cxios_is_defined_interpolate_domain_use_area & 401 (interpolate_domain_hdl%daddr) 402 use_area_ = use_area__tmp 403 ENDIF 404 369 405 IF (PRESENT(weight_filename_)) THEN 370 406 weight_filename__tmp = cxios_is_defined_interpolate_domain_weight_filename & -
XIOS/dev/dev_trunk_omp/src/interface/fortran_attr/interpolate_domain_interface_attr.F90
r1492 r1646 88 88 89 89 90 SUBROUTINE cxios_set_interpolate_domain_read_write_convention(interpolate_domain_hdl, read_write_convention, read_write_convention_size) BIND(C) 90 SUBROUTINE cxios_set_interpolate_domain_read_write_convention(interpolate_domain_hdl, read_write_convention, read_write_conven& 91 &tion_size) BIND(C) 91 92 USE ISO_C_BINDING 92 93 INTEGER (kind = C_INTPTR_T), VALUE :: interpolate_domain_hdl … … 95 96 END SUBROUTINE cxios_set_interpolate_domain_read_write_convention 96 97 97 SUBROUTINE cxios_get_interpolate_domain_read_write_convention(interpolate_domain_hdl, read_write_convention, read_write_convention_size) BIND(C) 98 SUBROUTINE cxios_get_interpolate_domain_read_write_convention(interpolate_domain_hdl, read_write_convention, read_write_conven& 99 &tion_size) BIND(C) 98 100 USE ISO_C_BINDING 99 101 INTEGER (kind = C_INTPTR_T), VALUE :: interpolate_domain_hdl … … 126 128 INTEGER (kind = C_INTPTR_T), VALUE :: interpolate_domain_hdl 127 129 END FUNCTION cxios_is_defined_interpolate_domain_renormalize 130 131 132 SUBROUTINE cxios_set_interpolate_domain_use_area(interpolate_domain_hdl, use_area) BIND(C) 133 USE ISO_C_BINDING 134 INTEGER (kind = C_INTPTR_T), VALUE :: interpolate_domain_hdl 135 LOGICAL (KIND=C_BOOL) , VALUE :: use_area 136 END SUBROUTINE cxios_set_interpolate_domain_use_area 137 138 SUBROUTINE cxios_get_interpolate_domain_use_area(interpolate_domain_hdl, use_area) BIND(C) 139 USE ISO_C_BINDING 140 INTEGER (kind = C_INTPTR_T), VALUE :: interpolate_domain_hdl 141 LOGICAL (KIND=C_BOOL) :: use_area 142 END SUBROUTINE cxios_get_interpolate_domain_use_area 143 144 FUNCTION cxios_is_defined_interpolate_domain_use_area(interpolate_domain_hdl) BIND(C) 145 USE ISO_C_BINDING 146 LOGICAL(kind=C_BOOL) :: cxios_is_defined_interpolate_domain_use_area 147 INTEGER (kind = C_INTPTR_T), VALUE :: interpolate_domain_hdl 148 END FUNCTION cxios_is_defined_interpolate_domain_use_area 128 149 129 150
Note: See TracChangeset
for help on using the changeset viewer.