Changeset 1638 for XIOS/trunk/src/interface/c/icdata.cpp
- Timestamp:
- 01/22/19 16:15:03 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/interface/c/icdata.cpp
r1622 r1638 60 60 { 61 61 std::string str; 62 MPI_Comm local_comm;63 MPI_Comm return_comm;62 ep_lib::MPI_Comm local_comm; 63 ep_lib::MPI_Comm return_comm; 64 64 65 65 if (!cstr2string(client_id, len_client_id, str)) return; 66 66 67 67 int initialized; 68 MPI_Initialized(&initialized); 68 ep_lib::MPI_Initialized(&initialized); 69 #ifdef _usingMPI 69 70 if (initialized) local_comm=MPI_Comm_f2c(*f_local_comm); 70 71 else local_comm=MPI_COMM_NULL; 72 #elif _usingEP 73 if (initialized) local_comm=EP_Comm_f2c(f_local_comm); 74 else local_comm=EP_COMM_NULL; 75 #endif 71 76 CXios::initClientSide(str, local_comm, return_comm); 77 #ifdef _usingMPI 72 78 *f_return_comm=MPI_Comm_c2f(return_comm); 79 #elif _usingEP 80 *f_return_comm=*static_cast<MPI_Fint* >(EP_Comm_c2f(return_comm)); 81 #endif 73 82 CTimer::get("XIOS init").suspend(); 74 83 CTimer::get("XIOS").suspend(); … … 80 89 { 81 90 std::string str; 82 MPI_Comm comm;91 ep_lib::MPI_Comm comm; 83 92 84 93 if (!cstr2string(context_id, len_context_id, str)) return; 85 94 CTimer::get("XIOS").resume(); 86 95 CTimer::get("XIOS init context").resume(); 96 #ifdef _usingMPI 87 97 comm=MPI_Comm_f2c(*f_comm); 98 #elif _usingEP 99 comm=EP_Comm_f2c(f_comm); 100 #endif 88 101 CClient::registerContext(str, comm); 89 102 CTimer::get("XIOS init context").suspend();
Note: See TracChangeset
for help on using the changeset viewer.