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

Timestamp:

05/20/19 13:14:51 (5 years ago)

Author:

yushan

Message:

MARK: branch merged with trunk @1660. Add option --omp to enable multithreading.

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 @@
       int initialized;
       MPI_Initialized(&initialized);
-      #ifdef _usingMPI
-      if (initialized) local_comm=MPI_Comm_f2c(*f_local_comm);
-      else local_comm=MPI_COMM_NULL;
-      #elif _usingEP
+      
+      #ifdef _usingEP
       ep_lib::fc_comm_map.clear();
       if (initialized) local_comm=EP_Comm_f2c((f_local_comm));
       else local_comm=MPI_COMM_NULL;
+      #else
+      if (initialized) local_comm=MPI_Comm_f2c(*f_local_comm);
+      else local_comm=MPI_COMM_NULL;
       #endif
       
@@ -79 +80 @@
 
       CXios::initClientSide(str, local_comm, return_comm);
-      #ifdef _usingMPI
+      
+      #ifdef _usingEP
+      *f_return_comm=*static_cast<MPI_Fint*>(EP_Comm_c2f(return_comm));
+      #else
       *f_return_comm=MPI_Comm_c2f(return_comm);
-      #elif _usingEP
-      *f_return_comm=*static_cast<MPI_Fint*>(EP_Comm_c2f(return_comm));
       #endif
       CTimer::get("XIOS init").suspend();
@@ -98 +100 @@
      CTimer::get("XIOS").resume();
      CTimer::get("XIOS init context").resume();
-     #ifdef _usingMPI
+     
+     #ifdef _usingEP
+     comm = EP_Comm_f2c(f_comm);
+     #else
      comm=MPI_Comm_f2c(*f_comm);
-     #elif _usingEP
-     comm = EP_Comm_f2c(f_comm);
      #endif
      CClient::registerContext(str, comm);