Changeset 1355 for XIOS/dev/branch_openmp/extern/src_ep_dev/ep_fortran.cpp

Timestamp:

12/05/17 16:24:42 (7 years ago)

Author:

yushan

Message:

unify MPI_Comm type

File:

• XIOS/dev/branch_openmp/extern/src_ep_dev/ep_fortran.cpp (modified) (2 diffs)

XIOS/dev/branch_openmp/extern/src_ep_dev/ep_fortran.cpp

@@ -18 +18 @@
     Debug("MPI_Comm_c2f");
     int fint;
-    #ifdef _intelmpi
+    //#ifdef _intelmpi
     fint = (::MPI_Fint)(to_mpi_comm(comm.mpi_comm));
-    #elif _openmpi
-    fint = ::MPI_Comm_c2f(to_mpi_comm(comm.mpi_comm));
-    #endif
+    //#elif _openmpi
+    //fint = ::MPI_Comm_c2f(to_mpi_comm(comm.mpi_comm));
+    //#endif
     
     std::map<std::pair<int, int>, MPI_Comm > ::iterator it;
@@ -60 +60 @@
        
       
-    #ifdef _openmpi
-    ::MPI_Comm base_comm = ::MPI_Comm_f2c(comm);
-    #elif _intelmpi
+    //#ifdef _openmpi
+    //::MPI_Comm base_comm = ::MPI_Comm_f2c(comm);
+    //#elif _intelmpi
     ::MPI_Comm *base_comm = new ::MPI_Comm;
     *base_comm = (::MPI_Comm)(comm);
-    #endif
+    //#endif
 
-    if(base_comm != static_cast< ::MPI_Comm* >(MPI_COMM_NULL.mpi_comm))
+    if(*base_comm != to_mpi_comm(MPI_COMM_NULL.mpi_comm))
     {
       if(omp_get_thread_num() == 0)