Changeset 1605 for XIOS/dev/dev_trunk_omp/src/interface/c/icdata.cpp

Timestamp:

11/21/18 10:21:44 (5 years ago)

Author:

yushan

Message:

branch_openmp merged and tested with trunk r1597

File:

• XIOS/dev/dev_trunk_omp/src/interface/c/icdata.cpp (modified) (3 diffs)

XIOS/dev/dev_trunk_omp/src/interface/c/icdata.cpp

@@ -67 +67 @@
       #elif _usingEP
       ep_lib::fc_comm_map.clear();
-      if (initialized) local_comm=ep_lib::EP_Comm_f2c((f_local_comm));
+      if (initialized) local_comm=EP_Comm_f2c((f_local_comm));
       else local_comm=MPI_COMM_NULL;
       #endif
@@ -77 +77 @@
       *f_return_comm=MPI_Comm_c2f(return_comm);
       #elif _usingEP
-      *f_return_comm=*static_cast<MPI_Fint*>(ep_lib::EP_Comm_c2f(return_comm));
+      *f_return_comm=*static_cast<MPI_Fint*>(EP_Comm_c2f(return_comm));
       #endif
       CTimer::get("XIOS init").suspend();
@@ -94 +94 @@
      comm=MPI_Comm_f2c(*f_comm);
      #elif _usingEP
-     comm = ep_lib::EP_Comm_f2c(f_comm);
+     comm = EP_Comm_f2c(f_comm);
      #endif
      CClient::registerContext(str, comm);