Changeset 1134 for XIOS/dev/branch_yushan_merged/extern/remap/src/parallel_tree.hpp

Timestamp:

05/16/17 17:54:30 (7 years ago)

Author:

yushan

Message:

branch merged with trunk r1130

File:

• XIOS/dev/branch_yushan_merged/extern/remap/src/parallel_tree.hpp (modified) (3 diffs)

XIOS/dev/branch_yushan_merged/extern/remap/src/parallel_tree.hpp

@@ -6 +6 @@
 #include "mpi_cascade.hpp"
 #include "mpi.hpp"
+#ifdef _usingEP
+#include "ep_declaration.hpp"
+#endif
 
 namespace sphereRemap {
@@ -12 +15 @@
 {
 public:
-        CParallelTree(MPI_Comm comm);
+        CParallelTree(ep_lib::MPI_Comm comm);
         ~CParallelTree();
 
@@ -34 +37 @@
         vector<CSampleTree> treeCascade; // first for sample tree, then for routing tree
         CMPICascade cascade;
-  MPI_Comm communicator ;
+        ep_lib::MPI_Comm communicator ;
 
 };