Changeset 1642 for XIOS/dev/branch_openmp/extern/remap/src/mpi_cascade.cpp

Timestamp:

01/23/19 10:31:44 (5 years ago)

Author:

yushan

Message:

dev on ADA. add flag switch _usingEP/_usingMPI

File:

• XIOS/dev/branch_openmp/extern/remap/src/mpi_cascade.cpp (modified) (2 diffs)

XIOS/dev/branch_openmp/extern/remap/src/mpi_cascade.cpp

@@ -1 +1 @@
 #include "mpi_cascade.hpp"
 #include <iostream>
-using namespace ep_lib;
 
 namespace sphereRemap {
 
-CMPICascade::CMPICascade(int nodes_per_level, MPI_Comm comm)
+CMPICascade::CMPICascade(int nodes_per_level, ep_lib::MPI_Comm comm)
 {
         int remaining_levels;
-        MPI_Comm intraComm;
+        ep_lib::MPI_Comm intraComm;
         int l = 0; // current level
         do {
@@ -16 +15 @@
                 level[l].p_grp_size = level[l].size/level[l].group_size;
         
-                MPI_Comm_split(comm, level[l].colour(), level[l].key(), &intraComm);
-                MPI_Comm_split(comm, level[l].p_colour(), level[l].p_key(), &(level[l].pg_comm));
+                ep_lib::MPI_Comm_split(comm, level[l].colour(), level[l].key(), &intraComm);
+                ep_lib::MPI_Comm_split(comm, level[l].p_colour(), level[l].p_key(), &(level[l].pg_comm));
                 comm = intraComm;
                 l++;