Changeset 1355 for XIOS/dev/branch_openmp/extern/remap

Timestamp:

12/05/17 16:24:42 (7 years ago)

Author:

yushan

Message:

unify MPI_Comm type

Location:

XIOS/dev/branch_openmp/extern/remap/src

Files:

• mapper.hpp (modified) (1 diff)
• mpi_cascade.hpp (modified) (1 diff)
• parallel_tree.cpp (modified) (1 diff)

XIOS/dev/branch_openmp/extern/remap/src/mapper.hpp

@@ -18 +18 @@
 {
 public:
-       Mapper(ep_lib::MPI_Comm comm) : communicator(comm), verbose(SILENT), neighbourElements(NULL), sstree(comm) {}
+       //Mapper(ep_lib::MPI_Comm comm) : communicator(comm), verbose(SILENT), neighbourElements(NULL), sstree(comm) {}
+       Mapper(ep_lib::MPI_Comm comm) : verbose(SILENT), neighbourElements(NULL), sstree(comm) 
+       {
+         ep_lib::MPI_Comm_dup(comm, &communicator);
+       }
+
        ~Mapper();
        void setVerbosity(verbosity v) {verbose=v ;}

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

@@ -12 +12 @@
 {
 public:
-  CCascadeLevel(ep_lib::MPI_Comm comm) : comm(comm)
+  CCascadeLevel(ep_lib::MPI_Comm in_comm) : comm(in_comm)
   {
+    ep_lib::MPI_Comm_dup(in_comm, &comm);
     ep_lib::MPI_Comm_size(comm, &size);
     ep_lib::MPI_Comm_rank(comm, &rank);

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

@@ -121 +121 @@
 }
 
-//CParallelTree::CParallelTree(MPI_Comm comm) : communicator(comm), cascade(MIN_NODE_SZ*MIN_NODE_SZ, comm)
-CParallelTree::CParallelTree(MPI_Comm comm) : communicator(comm), cascade(MAX_NODE_SZ*MAX_NODE_SZ*2, comm)
-{
-        treeCascade.reserve(cascade.num_levels);
-        for (int lev = 0; lev < cascade.num_levels; lev++)
-                treeCascade.push_back(CSampleTree(cascade.level[lev].group_size, assignLevel));
+//CParallelTree::CParallelTree(MPI_Comm comm) : communicator(comm), cascade(MIN_NODE_SZ*MIN_NODE_SZ*2, comm)
+CParallelTree::CParallelTree(MPI_Comm comm) : cascade(MAX_NODE_SZ*MAX_NODE_SZ*2, comm)
+{
+  MPI_Comm_dup(comm, &communicator);
+  treeCascade.reserve(cascade.num_levels);
+  for (int lev = 0; lev < cascade.num_levels; lev++)
+    treeCascade.push_back(CSampleTree(cascade.level[lev].group_size, assignLevel));
 }