Changeset 1520 for XIOS/dev/branch_openmp/extern/src_ep_dev/ep_size.cpp

Timestamp:

06/04/18 19:25:08 (6 years ago)

Author:

yushan

Message:

save dev. TO DO : test with xios

File:

• XIOS/dev/branch_openmp/extern/src_ep_dev/ep_size.cpp (modified) (1 diff)

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

@@ -7 +7 @@
 {
 
-
-
-
   int MPI_Comm_size(MPI_Comm comm, int* size)
   {
-    
-    if(comm.is_ep)
+    if(comm->is_ep)
     {
-      if(!comm.is_intercomm)
-      {
-        *size = comm.ep_comm_ptr->size_rank_info[0].second;
-
-        return 0;
-      }
-      else
-      {
-        *size = comm.ep_comm_ptr->intercomm->size_rank_info[0].second;
-
-        return 0;
-      }
-
+      Debug("MPI_Comm_size with EP");
+      return *size = comm->ep_comm_ptr->size_rank_info[0].second;
     }
 
-    Debug("Calling EP_Comm_size\n");
-
-    if(comm.mpi_comm != static_cast< ::MPI_Comm*>(MPI_COMM_NULL.mpi_comm))
-    {
-      ::MPI_Comm mpi_comm = to_mpi_comm(comm.mpi_comm); 
-      int mpi_size;
-
-      ::MPI_Comm_size(mpi_comm, &mpi_size);
-      printf("============ ep comm size called for non ep comm, %d\n", mpi_size);
-      *size = mpi_size;
-      return 0;
-    }
-
-    else
-    {
-      *size = MPI_UNDEFINED;
-      printf("============ ep comm size called for non ep comm not defined\n");
-      return 0;
-    }
+    return MPI_Comm_size_mpi(comm, size);
   }
 
   int MPI_Comm_remote_size(MPI_Comm comm, int *size)
   {
-    if(!comm.is_ep)
+    if(comm->is_ep)
     {
-      if(comm.mpi_comm != static_cast< ::MPI_Comm*>(MPI_COMM_NULL.mpi_comm))
+      if(comm->is_intercomm)
       {
-        ::MPI_Comm mpi_comm = to_mpi_comm(comm.mpi_comm); 
-        ::MPI_Comm_remote_size(mpi_comm, size);
-        return 0;
+        Debug("MPI_Comm_remote_size with EP_intercomm");
+        return *size = comm->ep_comm_ptr->intercomm->intercomm_rank_map->size();
       }
-
       else
       {
-        *size = MPI_UNDEFINED;
-        return 0;
+        Debug("MPI_Comm_remote_size with EP_intracomm");
+        return *size=0;
       }
     }
-    
-    if(comm.is_intercomm)
-    {
-      *size = comm.ep_comm_ptr->intercomm->remote_rank_map->size();
-      return 0;
-    }
-    *size = MPI_UNDEFINED;
-    return 0; 
+    return MPI_Comm_remote_size_mpi(comm, size);
   }
+
+
+  int MPI_Comm_size_mpi(MPI_Comm comm, int* size)
+  {
+    Debug("MPI_Comm_size with MPI");
+    return ::MPI_Comm_size(to_mpi_comm(comm->mpi_comm), size);
+  }
+
+  int MPI_Comm_remote_size_mpi(MPI_Comm comm, int *size)
+  {
+    Debug("MPI_Comm_remote_size with MPI");
+    return ::MPI_Comm_remote_size(to_mpi_comm(comm->mpi_comm), size);
+  }
+
+
 }