Changeset 1642 for XIOS/dev/branch_openmp/src/interface
- Timestamp:
- 01/23/19 10:31:44 (5 years ago)
- Location:
- XIOS/dev/branch_openmp/src/interface/c
- Files:
-
- 29 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/branch_openmp/src/interface/c/icaxis.cpp
r1545 r1642 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/branch_openmp/src/interface/c/iccalendar.cpp
r1545 r1642 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/branch_openmp/src/interface/c/iccalendar_wrapper.cpp
r1545 r1642 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/branch_openmp/src/interface/c/iccompute_connectivity_domain.cpp
r1545 r1642 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/branch_openmp/src/interface/c/iccontext.cpp
r1545 r1642 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/branch_openmp/src/interface/c/icdata.cpp
r1545 r1642 9 9 #include <iostream> 10 10 11 #include "mpi_std.hpp" 11 12 12 #include "xios.hpp" 13 //#include "oasis_cinterface.hpp"13 #include "oasis_cinterface.hpp" 14 14 15 15 #include "attribute_template.hpp" … … 23 23 #include "context.hpp" 24 24 #include "context_client.hpp" 25 25 #include "mpi.hpp" 26 26 #include "timer.hpp" 27 27 #include "array_new.hpp" … … 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; … … 61 66 62 67 int initialized; 63 MPI_Initialized(&initialized);68 ep_lib::MPI_Initialized(&initialized); 64 69 #ifdef _usingMPI 65 70 if (initialized) local_comm=MPI_Comm_f2c(*f_local_comm); 66 71 else local_comm=MPI_COMM_NULL; 67 72 #elif _usingEP 68 ep_lib::fc_comm_map.clear(); 69 if (initialized) local_comm=ep_lib::EP_Comm_f2c((f_local_comm)); 70 else local_comm=MPI_COMM_NULL; 73 if (initialized) local_comm=EP_Comm_f2c(f_local_comm); 74 else local_comm=EP_COMM_NULL; 71 75 #endif 72 73 74 75 76 CXios::initClientSide(str, local_comm, return_comm); 76 77 #ifdef _usingMPI 77 78 *f_return_comm=MPI_Comm_c2f(return_comm); 78 79 #elif _usingEP 79 *f_return_comm=*static_cast<MPI_Fint* >(ep_lib::EP_Comm_c2f(return_comm));80 *f_return_comm=*static_cast<MPI_Fint* >(EP_Comm_c2f(return_comm)); 80 81 #endif 81 82 CTimer::get("XIOS init").suspend(); 82 83 CTimer::get("XIOS").suspend(); 83 84 } 85 CATCH_DUMP_STACK 84 86 85 87 void cxios_context_initialize(const char* context_id , int len_context_id, MPI_Fint* f_comm) 88 TRY 86 89 { 87 90 std::string str; … … 94 97 comm=MPI_Comm_f2c(*f_comm); 95 98 #elif _usingEP 96 comm = ep_lib::EP_Comm_f2c(f_comm);99 comm=EP_Comm_f2c(f_comm); 97 100 #endif 98 101 CClient::registerContext(str, comm); … … 100 103 CTimer::get("XIOS").suspend(); 101 104 } 105 CATCH_DUMP_STACK 106 107 void cxios_oasis_enddef() 108 TRY 109 { 110 CTimer::get("XIOS").resume(); 111 CClient::callOasisEnddef(); 112 CTimer::get("XIOS").suspend(); 113 } 114 CATCH_DUMP_STACK 102 115 103 116 void cxios_context_is_initialized(const char* context_id , int len_context_id, bool* initialized) 117 TRY 104 118 { 105 119 std::string str; … … 111 125 CTimer::get("XIOS").suspend(); 112 126 } 113 114 void cxios_context_close_definition() 127 CATCH_DUMP_STACK 128 129 void cxios_context_close_definition() 130 TRY 115 131 { 116 132 CTimer::get("XIOS").resume(); … … 121 137 CTimer::get("XIOS").suspend(); 122 138 } 139 CATCH_DUMP_STACK 123 140 124 141 void cxios_context_finalize() 142 TRY 125 143 { 126 144 CTimer::get("XIOS").resume(); … … 131 149 CTimer::get("XIOS").suspend(); 132 150 } 151 CATCH_DUMP_STACK 133 152 134 153 void cxios_finalize() 154 TRY 135 155 { 136 156 CTimer::get("XIOS").resume(); … … 138 158 CXios::clientFinalize(); 139 159 } 160 CATCH_DUMP_STACK 140 161 141 162 void cxios_solve_inheritance() 163 TRY 142 164 { 143 165 CTimer::get("XIOS").resume(); … … 146 168 CTimer::get("XIOS").suspend(); 147 169 } 170 CATCH_DUMP_STACK 148 171 149 172 /*! \brief This group of functions retrieve variable information from the configuration file (.xml) … … 158 181 */ 159 182 void cxios_get_variable_data_k8(const char* varId, int varIdSize, double* data, bool* isVarExisted) 183 TRY 160 184 { 161 185 std::string varIdStr; … … 176 200 CTimer::get("XIOS").suspend(); 177 201 } 202 CATCH_DUMP_STACK 178 203 179 204 void cxios_get_variable_data_k4(const char* varId, int varIdSize, float* data, bool* isVarExisted) 205 TRY 180 206 { 181 207 std::string varIdStr; … … 196 222 CTimer::get("XIOS").suspend(); 197 223 } 224 CATCH_DUMP_STACK 198 225 199 226 void cxios_get_variable_data_int(const char* varId, int varIdSize, int* data, bool* isVarExisted) 227 TRY 200 228 { 201 229 std::string varIdStr; … … 216 244 CTimer::get("XIOS").suspend(); 217 245 } 246 CATCH_DUMP_STACK 218 247 219 248 void cxios_get_variable_data_logic(const char* varId, int varIdSize, bool* data, bool* isVarExisted) 249 TRY 220 250 { 221 251 std::string varIdStr; … … 236 266 CTimer::get("XIOS").suspend(); 237 267 } 268 CATCH_DUMP_STACK 238 269 239 270 void cxios_get_variable_data_char(const char* varId, int varIdSize, char* data, int dataSizeIn, bool* isVarExisted) 271 TRY 240 272 { 241 273 std::string varIdStr; … … 257 289 CTimer::get("XIOS").suspend(); 258 290 } 291 CATCH_DUMP_STACK 259 292 260 293 /*! \brief This group of functions write information into existing variable in the configuration file (.xml) … … 269 302 */ 270 303 void cxios_set_variable_data_k8(const char* varId, int varIdSize, double data, bool* isVarExisted) 271 { 304 TRY 305 { 272 306 std::string varIdStr; 273 307 if (!cstr2string(varId, varIdSize, varIdStr)) return; … … 288 322 CTimer::get("XIOS").suspend(); 289 323 } 324 CATCH_DUMP_STACK 290 325 291 326 void cxios_set_variable_data_k4(const char* varId, int varIdSize, float data, bool* isVarExisted) 327 TRY 292 328 { 293 329 std::string varIdStr; … … 309 345 CTimer::get("XIOS").suspend(); 310 346 } 347 CATCH_DUMP_STACK 311 348 312 349 void cxios_set_variable_data_int(const char* varId, int varIdSize, int data, bool* isVarExisted) 350 TRY 313 351 { 314 352 std::string varIdStr; … … 331 369 CTimer::get("XIOS").suspend(); 332 370 } 371 CATCH_DUMP_STACK 333 372 334 373 void cxios_set_variable_data_logic(const char* varId, int varIdSize, bool data, bool* isVarExisted) 374 TRY 335 375 { 336 376 std::string varIdStr; … … 352 392 CTimer::get("XIOS").suspend(); 353 393 } 394 CATCH_DUMP_STACK 354 395 355 396 void cxios_set_variable_data_char(const char* varId, int varIdSize, const char* data, int dataSizeIn, bool* isVarExisted) 356 { 397 TRY 398 { 357 399 std::string varIdStr, dataStr; 358 400 if (!cstr2string(varId, varIdSize, varIdStr)) return; … … 378 420 CTimer::get("XIOS").suspend(); 379 421 } 380 422 CATCH_DUMP_STACK 381 423 382 424 // ---------------------- Ecriture des données ------------------------------ 383 425 384 426 void cxios_write_data_k80(const char* fieldid, int fieldid_size, double* data_k8, int data_Xsize) 427 TRY 385 428 { 386 429 std::string fieldid_str; … … 397 440 CTimer::get("XIOS").suspend(); 398 441 } 442 CATCH_DUMP_STACK 399 443 400 444 void cxios_write_data_k81(const char* fieldid, int fieldid_size, double* data_k8, int data_Xsize) 445 TRY 401 446 { 402 447 std::string fieldid_str; … … 416 461 CTimer::get("XIOS").suspend(); 417 462 } 463 CATCH_DUMP_STACK 418 464 419 465 void cxios_write_data_k82(const char* fieldid, int fieldid_size, double* data_k8, int data_Xsize, int data_Ysize) 466 TRY 420 467 { 421 468 std::string fieldid_str; … … 435 482 CTimer::get("XIOS").suspend(); 436 483 } 484 CATCH_DUMP_STACK 437 485 438 486 void cxios_write_data_k83(const char* fieldid, int fieldid_size, double* data_k8, int data_Xsize, int data_Ysize, int data_Zsize) 487 TRY 439 488 { 440 489 std::string fieldid_str; … … 454 503 CTimer::get("XIOS").suspend(); 455 504 } 505 CATCH_DUMP_STACK 456 506 457 507 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) 508 TRY 458 509 { 459 510 std::string fieldid_str; … … 473 524 CTimer::get("XIOS").suspend(); 474 525 } 526 CATCH_DUMP_STACK 475 527 476 528 void cxios_write_data_k85(const char* fieldid, int fieldid_size, double* data_k8, 477 529 int data_0size, int data_1size, int data_2size, 478 530 int data_3size, int data_4size) 531 TRY 479 532 { 480 533 std::string fieldid_str; … … 494 547 CTimer::get("XIOS").suspend(); 495 548 } 549 CATCH_DUMP_STACK 496 550 497 551 void cxios_write_data_k86(const char* fieldid, int fieldid_size, double* data_k8, 498 552 int data_0size, int data_1size, int data_2size, 499 553 int data_3size, int data_4size, int data_5size) 554 TRY 500 555 { 501 556 std::string fieldid_str; … … 515 570 CTimer::get("XIOS").suspend(); 516 571 } 572 CATCH_DUMP_STACK 517 573 518 574 void cxios_write_data_k87(const char* fieldid, int fieldid_size, double* data_k8, … … 520 576 int data_3size, int data_4size, int data_5size, 521 577 int data_6size) 578 TRY 522 579 { 523 580 std::string fieldid_str; … … 537 594 CTimer::get("XIOS").suspend(); 538 595 } 596 CATCH_DUMP_STACK 539 597 540 598 void cxios_write_data_k40(const char* fieldid, int fieldid_size, float* data_k4, int data_Xsize) 599 TRY 541 600 { 542 601 std::string fieldid_str; … … 556 615 CTimer::get("XIOS").suspend(); 557 616 } 617 CATCH_DUMP_STACK 558 618 559 619 void cxios_write_data_k41(const char* fieldid, int fieldid_size, float* data_k4, int data_Xsize) 620 TRY 560 621 { 561 622 std::string fieldid_str; … … 577 638 CTimer::get("XIOS").suspend(); 578 639 } 640 CATCH_DUMP_STACK 579 641 580 642 void cxios_write_data_k42(const char* fieldid, int fieldid_size, float* data_k4, int data_Xsize, int data_Ysize) 643 TRY 581 644 { 582 645 std::string fieldid_str; … … 598 661 CTimer::get("XIOS").suspend(); 599 662 } 663 CATCH_DUMP_STACK 600 664 601 665 void cxios_write_data_k43(const char* fieldid, int fieldid_size, float* data_k4, int data_Xsize, int data_Ysize, int data_Zsize) 666 TRY 602 667 { 603 668 std::string fieldid_str; … … 619 684 CTimer::get("XIOS").suspend(); 620 685 } 686 CATCH_DUMP_STACK 621 687 622 688 void cxios_write_data_k44(const char* fieldid, int fieldid_size, float* data_k4, 623 689 int data_0size, int data_1size, int data_2size, 624 690 int data_3size) 691 TRY 625 692 { 626 693 std::string fieldid_str; … … 642 709 CTimer::get("XIOS").suspend(); 643 710 } 711 CATCH_DUMP_STACK 644 712 645 713 void cxios_write_data_k45(const char* fieldid, int fieldid_size, float* data_k4, 646 714 int data_0size, int data_1size, int data_2size, 647 715 int data_3size, int data_4size) 716 TRY 648 717 { 649 718 std::string fieldid_str; … … 665 734 CTimer::get("XIOS").suspend(); 666 735 } 736 CATCH_DUMP_STACK 667 737 668 738 void cxios_write_data_k46(const char* fieldid, int fieldid_size, float* data_k4, 669 739 int data_0size, int data_1size, int data_2size, 670 740 int data_3size, int data_4size, int data_5size) 741 TRY 671 742 { 672 743 std::string fieldid_str; … … 688 759 CTimer::get("XIOS").suspend(); 689 760 } 761 CATCH_DUMP_STACK 690 762 691 763 void cxios_write_data_k47(const char* fieldid, int fieldid_size, float* data_k4, … … 693 765 int data_3size, int data_4size, int data_5size, 694 766 int data_6size) 767 TRY 695 768 { 696 769 std::string fieldid_str; … … 712 785 CTimer::get("XIOS").suspend(); 713 786 } 787 CATCH_DUMP_STACK 714 788 715 789 // ---------------------- Lecture des données ------------------------------ 716 790 717 791 void cxios_read_data_k80(const char* fieldid, int fieldid_size, double* data_k8, int data_Xsize) 792 TRY 718 793 { 719 794 std::string fieldid_str; … … 733 808 CTimer::get("XIOS").suspend(); 734 809 } 810 CATCH_DUMP_STACK 735 811 736 812 void cxios_read_data_k81(const char* fieldid, int fieldid_size, double* data_k8, int data_Xsize) 813 TRY 737 814 { 738 815 std::string fieldid_str; … … 752 829 CTimer::get("XIOS").suspend(); 753 830 } 831 CATCH_DUMP_STACK 754 832 755 833 void cxios_read_data_k82(const char* fieldid, int fieldid_size, double* data_k8, int data_Xsize, int data_Ysize) 834 TRY 756 835 { 757 836 std::string fieldid_str; … … 771 850 CTimer::get("XIOS").suspend(); 772 851 } 852 CATCH_DUMP_STACK 773 853 774 854 void cxios_read_data_k83(const char* fieldid, int fieldid_size, double* data_k8, int data_Xsize, int data_Ysize, int data_Zsize) 855 TRY 775 856 { 776 857 std::string fieldid_str; … … 790 871 CTimer::get("XIOS").suspend(); 791 872 } 873 CATCH_DUMP_STACK 792 874 793 875 void cxios_read_data_k84(const char* fieldid, int fieldid_size, double* data_k8, 794 876 int data_0size, int data_1size, int data_2size, 795 877 int data_3size) 878 TRY 796 879 { 797 880 std::string fieldid_str; … … 811 894 CTimer::get("XIOS").suspend(); 812 895 } 896 CATCH_DUMP_STACK 813 897 814 898 void cxios_read_data_k85(const char* fieldid, int fieldid_size, double* data_k8, 815 899 int data_0size, int data_1size, int data_2size, 816 900 int data_3size, int data_4size) 901 TRY 817 902 { 818 903 std::string fieldid_str; … … 832 917 CTimer::get("XIOS").suspend(); 833 918 } 919 CATCH_DUMP_STACK 834 920 835 921 void cxios_read_data_k86(const char* fieldid, int fieldid_size, double* data_k8, 836 922 int data_0size, int data_1size, int data_2size, 837 923 int data_3size, int data_4size, int data_5size) 924 TRY 838 925 { 839 926 std::string fieldid_str; … … 853 940 CTimer::get("XIOS").suspend(); 854 941 } 942 CATCH_DUMP_STACK 855 943 856 944 void cxios_read_data_k87(const char* fieldid, int fieldid_size, double* data_k8, … … 858 946 int data_3size, int data_4size, int data_5size, 859 947 int data_6size) 948 TRY 860 949 { 861 950 std::string fieldid_str; … … 875 964 CTimer::get("XIOS").suspend(); 876 965 } 966 CATCH_DUMP_STACK 877 967 878 968 void cxios_read_data_k40(const char* fieldid, int fieldid_size, float* data_k4, int data_Xsize) 969 TRY 879 970 { 880 971 std::string fieldid_str; … … 896 987 CTimer::get("XIOS").suspend(); 897 988 } 989 CATCH_DUMP_STACK 898 990 899 991 void cxios_read_data_k41(const char* fieldid, int fieldid_size, float* data_k4, int data_Xsize) 992 TRY 900 993 { 901 994 std::string fieldid_str; … … 917 1010 CTimer::get("XIOS").suspend(); 918 1011 } 1012 CATCH_DUMP_STACK 919 1013 920 1014 void cxios_read_data_k42(const char* fieldid, int fieldid_size, float* data_k4, int data_Xsize, int data_Ysize) 1015 TRY 921 1016 { 922 1017 std::string fieldid_str; … … 938 1033 CTimer::get("XIOS").suspend(); 939 1034 } 1035 CATCH_DUMP_STACK 940 1036 941 1037 void cxios_read_data_k43(const char* fieldid, int fieldid_size, float* data_k4, int data_Xsize, int data_Ysize, int data_Zsize) 1038 TRY 942 1039 { 943 1040 std::string fieldid_str; … … 959 1056 CTimer::get("XIOS").suspend(); 960 1057 } 1058 CATCH_DUMP_STACK 961 1059 962 1060 void cxios_read_data_k44(const char* fieldid, int fieldid_size, float* data_k4, 963 1061 int data_0size, int data_1size, int data_2size, 964 1062 int data_3size) 1063 TRY 965 1064 { 966 1065 std::string fieldid_str; … … 982 1081 CTimer::get("XIOS").suspend(); 983 1082 } 1083 CATCH_DUMP_STACK 984 1084 985 1085 void cxios_read_data_k45(const char* fieldid, int fieldid_size, float* data_k4, 986 1086 int data_0size, int data_1size, int data_2size, 987 1087 int data_3size, int data_4size) 1088 TRY 988 1089 { 989 1090 std::string fieldid_str; … … 1005 1106 CTimer::get("XIOS").suspend(); 1006 1107 } 1108 CATCH_DUMP_STACK 1007 1109 1008 1110 void cxios_read_data_k46(const char* fieldid, int fieldid_size, float* data_k4, 1009 1111 int data_0size, int data_1size, int data_2size, 1010 1112 int data_3size, int data_4size, int data_5size) 1113 TRY 1011 1114 { 1012 1115 std::string fieldid_str; … … 1028 1131 CTimer::get("XIOS").suspend(); 1029 1132 } 1133 CATCH_DUMP_STACK 1030 1134 1031 1135 void cxios_read_data_k47(const char* fieldid, int fieldid_size, float* data_k4, … … 1033 1137 int data_3size, int data_4size, int data_5size, 1034 1138 int data_6size) 1139 TRY 1035 1140 { 1036 1141 std::string fieldid_str; … … 1052 1157 CTimer::get("XIOS").suspend(); 1053 1158 } 1159 CATCH_DUMP_STACK 1054 1160 } // extern "C" -
XIOS/dev/branch_openmp/src/interface/c/icdate.cpp
r1545 r1642 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)"), 69 76 date_c.year, date_c.month, date_c.day, 70 77 date_c.hour, date_c.minute, date_c.second); 71 72 78 xios::CDuration dur( dur_c.year, dur_c.month, dur_c.day, dur_c.hour, dur_c.minute, dur_c.second, dur_c.timestep ); 73 79 xios::CDate res = date + dur; 74 80 return { res.getYear(), res.getMonth(), res.getDay(), res.getHour(), res.getMinute(), res.getSecond() }; 75 81 } 82 CATCH_DUMP_STACK 76 83 77 84 cxios_date cxios_date_sub_duration(cxios_date date_c, cxios_duration dur_c) 85 TRY 78 86 { 79 87 xios::CDate date = xios::CDate(getCalendar("cxios_date cxios_date_sub_duration(cxios_date date_c, cxios_duration dur_c)"), … … 85 93 return { res.getYear(), res.getMonth(), res.getDay(), res.getHour(), res.getMinute(), res.getSecond() }; 86 94 } 95 CATCH_DUMP_STACK 87 96 88 97 cxios_duration cxios_date_sub(cxios_date date1_c, cxios_date date2_c) 98 TRY 89 99 { 90 100 xios::CDate date1 = xios::CDate(getCalendar("cxios_duration cxios_date_sub(cxios_date date1_c, cxios_date date2_c)"), … … 97 107 return { res.year, res.month, res.day, res.hour, res.minute, res.second, res.timestep }; 98 108 } 109 CATCH_DUMP_STACK 99 110 100 111 bool cxios_date_eq(cxios_date date1_c, cxios_date date2_c) 112 TRY 101 113 { 102 114 xios::CDate date1 = xios::CDate(getCalendar("bool cxios_date_eq(cxios_date date1_c, cxios_date date2_c)"), … … 108 120 return (date1 == date2); 109 121 } 122 CATCH_DUMP_STACK 110 123 111 124 bool cxios_date_neq(cxios_date date1_c, cxios_date date2_c) 125 TRY 112 126 { 113 127 xios::CDate date1 = xios::CDate(getCalendar("bool cxios_date_eq(cxios_date date1_c, cxios_date date2_c)"), … … 119 133 return (date1 != date2); 120 134 } 135 CATCH_DUMP_STACK 121 136 122 137 bool cxios_date_lt(cxios_date date1_c, cxios_date date2_c) 138 TRY 123 139 { 124 140 xios::CDate date1 = xios::CDate(getCalendar("bool cxios_date_eq(cxios_date date1_c, cxios_date date2_c)"), … … 130 146 return (date1 < date2); 131 147 } 148 CATCH_DUMP_STACK 132 149 133 150 bool cxios_date_le(cxios_date date1_c, cxios_date date2_c) 151 TRY 134 152 { 135 153 xios::CDate date1 = xios::CDate(getCalendar("bool cxios_date_eq(cxios_date date1_c, cxios_date date2_c)"), … … 141 159 return (date1 <= date2); 142 160 } 161 CATCH_DUMP_STACK 143 162 144 163 bool cxios_date_gt(cxios_date date1_c, cxios_date date2_c) 164 TRY 145 165 { 146 166 xios::CDate date1 = xios::CDate(getCalendar("bool cxios_date_eq(cxios_date date1_c, cxios_date date2_c)"), … … 152 172 return (date1 > date2); 153 173 } 174 CATCH_DUMP_STACK 154 175 155 176 bool cxios_date_ge(cxios_date date1_c, cxios_date date2_c) 177 TRY 156 178 { 157 179 xios::CDate date1 = xios::CDate(getCalendar("bool cxios_date_eq(cxios_date date1_c, cxios_date date2_c)"), … … 163 185 return (date1 >= date2); 164 186 } 187 CATCH_DUMP_STACK 165 188 166 189 int cxios_date_get_second_of_year(cxios_date date_c) 190 TRY 167 191 { 168 192 xios::CDate date = xios::CDate(getCalendar("int cxios_date_get_second_of_year(cxios_date date_c)"), … … 171 195 return date.getSecondOfYear(); 172 196 } 197 CATCH_DUMP_STACK 173 198 174 199 double cxios_date_get_day_of_year(cxios_date date_c) 200 TRY 175 201 { 176 202 xios::CDate date = xios::CDate(getCalendar("int cxios_date_get_day_of_year(cxios_date date_c)"), … … 179 205 return date.getDayOfYear(); 180 206 } 207 CATCH_DUMP_STACK 181 208 182 209 double cxios_date_get_fraction_of_year(cxios_date date_c) 210 TRY 183 211 { 184 212 xios::CDate date = xios::CDate(getCalendar("int cxios_date_get_fraction_of_year(cxios_date date_c)"), … … 187 215 return date.getFractionOfYear(); 188 216 } 217 CATCH_DUMP_STACK 189 218 190 219 int cxios_date_get_second_of_day(cxios_date date_c) 220 TRY 191 221 { 192 222 xios::CDate date = xios::CDate(getCalendar("int cxios_date_get_second_of_day(cxios_date date_c)"), … … 195 225 return date.getSecondOfDay(); 196 226 } 227 CATCH_DUMP_STACK 197 228 198 229 double cxios_date_get_fraction_of_day(cxios_date date_c) 230 TRY 199 231 { 200 232 xios::CDate date = xios::CDate(getCalendar("int cxios_date_get_fraction_of_day(cxios_date date_c)"), … … 203 235 return date.getFractionOfDay(); 204 236 } 237 CATCH_DUMP_STACK 205 238 } // extern "C" -
XIOS/dev/branch_openmp/src/interface/c/icdomain.cpp
r1545 r1642 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/branch_openmp/src/interface/c/icduplicate_scalar_to_axis.cpp
r1545 r1642 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/branch_openmp/src/interface/c/icduration.cpp
r1545 r1642 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/branch_openmp/src/interface/c/icexpand_domain.cpp
r1545 r1642 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/branch_openmp/src/interface/c/icextract_to_axis.cpp
r1545 r1642 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/branch_openmp/src/interface/c/icextract_to_scalar.cpp
r1545 r1642 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/branch_openmp/src/interface/c/icfield.cpp
r1545 r1642 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/branch_openmp/src/interface/c/icfile.cpp
r1545 r1642 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/branch_openmp/src/interface/c/icgenerate_rectilinear_domain.cpp
r1545 r1642 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/branch_openmp/src/interface/c/icgrid.cpp
r1545 r1642 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/branch_openmp/src/interface/c/icinterpolate.cpp
r1545 r1642 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/branch_openmp/src/interface/c/icinverse_axis.cpp
r1545 r1642 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/branch_openmp/src/interface/c/icreduce_axis_to_axis.cpp
r1545 r1642 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/branch_openmp/src/interface/c/icreduce_scalar_to_scalar.cpp
r1545 r1642 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/branch_openmp/src/interface/c/icreduce_to_axis.cpp
r1545 r1642 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/branch_openmp/src/interface/c/icreduce_to_scalar.cpp
r1545 r1642 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/branch_openmp/src/interface/c/icreorder_domain.cpp
r1545 r1642 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/branch_openmp/src/interface/c/icscalar.cpp
r1545 r1642 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/branch_openmp/src/interface/c/ictemporal_splitting.cpp
r1545 r1642 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/branch_openmp/src/interface/c/icvariable.cpp
r1545 r1642 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/branch_openmp/src/interface/c/iczoom.cpp
r1545 r1642 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/branch_openmp/src/interface/c/oasis_cinterface.cpp
r1365 r1642 1 1 #include "oasis_cinterface.hpp" 2 2 #include <string> 3 using namespace ep_lib; 3 #include "mpi.hpp" 4 4 5 5 namespace xios … … 21 21 } 22 22 23 void oasis_get_localcomm( MPI_Comm& comm)23 void oasis_get_localcomm(ep_lib::MPI_Comm& comm) 24 24 { 25 MPI_Fint f_comm ;25 ep_lib::MPI_Fint f_comm ; 26 26 27 27 fxios_oasis_get_localcomm(&f_comm) ; 28 //comm= EP_Comm_f2c(f_comm.mpi_fint) ;28 //comm=MPI_Comm_f2c(f_comm) ; 29 29 } 30 30 31 void oasis_get_intracomm( MPI_Comm& comm_client_server,const std::string& server_id)31 void oasis_get_intracomm(ep_lib::MPI_Comm& comm_client_server,const std::string& server_id) 32 32 { 33 MPI_Fint f_comm ;33 ep_lib::MPI_Fint f_comm ; 34 34 35 35 fxios_oasis_get_intracomm(&f_comm,server_id.data(),server_id.size()) ; 36 //comm_client_server= EP_Comm_f2c(f_comm.mpi_fint) ;36 //comm_client_server=MPI_Comm_f2c(f_comm) ; 37 37 } 38 38 39 void oasis_get_intercomm( MPI_Comm& comm_client_server,const std::string& server_id)39 void oasis_get_intercomm(ep_lib::MPI_Comm& comm_client_server,const std::string& server_id) 40 40 { 41 MPI_Fint f_comm ;41 ep_lib::MPI_Fint f_comm ; 42 42 43 43 fxios_oasis_get_intercomm(&f_comm,server_id.data(),server_id.size()) ; 44 //comm_client_server= EP_Comm_f2c(f_comm.mpi_fint) ;44 //comm_client_server=MPI_Comm_f2c(f_comm) ; 45 45 } 46 46 }
Note: See TracChangeset
for help on using the changeset viewer.