Changeset 1517 for XIOS/dev/branch_openmp/extern/ep_dev/ep_lib.cpp

Timestamp:

06/01/18 15:24:53 (6 years ago)

Author:

yushan

Message:

save dev

File:

• XIOS/dev/branch_openmp/extern/ep_dev/ep_lib.cpp (modified) (4 diffs)

XIOS/dev/branch_openmp/extern/ep_dev/ep_lib.cpp

@@ -4 +4 @@
 #include <iostream>
 #include <fstream>
+#include "ep_mpi.hpp"
 
 using namespace std;
@@ -14 +15 @@
 namespace ep_lib
 { 
-  bool ep_comm::is_null()
-  {
-    if(!this->is_intercomm)
-      return this->mpi_comm == MPI_COMM_NULL->mpi_comm;
-    else
-      return this->ep_comm_ptr->intercomm->mpi_inter_comm == MPI_COMM_NULL->mpi_comm;
-  }
 
   int tag_combine(int real_tag, int src, int dest)
@@ -47 +41 @@
   int MPI_Get_count(const MPI_Status *status, MPI_Datatype datatype, int *count)
   {
-
-    ::MPI_Status *mpi_status = static_cast< ::MPI_Status* >(status->mpi_status);
-    ::MPI_Datatype *mpi_datatype = static_cast< ::MPI_Datatype*>(datatype);
-
-    ::MPI_Get_count(mpi_status, *mpi_datatype, count);
+    return ::MPI_Get_count(to_mpi_status_ptr(*status), to_mpi_type(datatype), count);
   }
 
@@ -227 +217 @@
 {
   return *(static_cast< MPI_Comm* >(comm));
+} 
+
+MPI_Comm* to_mpi_comm_ptr(void* comm)
+{
+  return static_cast< MPI_Comm* >(comm);
 }