Changeset 1746 for XIOS/dev/dev_trunk_omp/extern/src_ep_dev/ep_fortran.cpp

Timestamp:

10/17/19 17:22:04 (5 years ago)

Author:

yushan

Message:

Generic_testcase: remove _openmpi _intelmpi flags. EP library is no longer sensitive to the underlying MPI library. Tested on Irene with generic_testcase

File:

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

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

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