Changeset 1602 for XIOS/dev/dev_trunk_omp/extern/remap/src/parallel_tree.hpp

Timestamp:

11/19/18 16:28:03 (5 years ago)

Author:

yushan

Message:

branch_openmp merged with trunk r1597

File:

• XIOS/dev/dev_trunk_omp/extern/remap/src/parallel_tree.hpp (modified) (1 diff)

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

@@ -12 +12 @@
 {
 public:
-        CParallelTree(MPI_Comm comm);
-        ~CParallelTree();
+  CParallelTree(ep_lib::MPI_Comm comm);
+  ~CParallelTree();
 
-        void build(vector<Node>& node, vector<Node>& node2);
+  void build(vector<Node>& node, vector<Node>& node2);
 
-        void routeNodes(vector<int>& route, vector<Node>& nodes, int level = 0);
-        void routeIntersections(vector<vector<int> >& route, vector<Node>& nodes, int level = 0);
+  void routeNodes(vector<int>& route, vector<Node>& nodes, int level = 0);
+  void routeIntersections(vector<vector<int> >& route, vector<Node>& nodes, int level = 0);
 
-        int nbLocalElements;
-        Elt* localElements;
+  int nbLocalElements;
+  Elt* localElements;
 
-        CTree localTree;
+  CTree localTree;
 
 private:
-        void updateCirclesForRouting(Coord rootCentre, double rootRadius, int level = 0);
-        void buildSampleTreeCascade(vector<Node>& sampleNodes, int level = 0);
-        void buildLocalTree(const vector<Node>& node, const vector<int>& route);
-        void buildRouteTree();
+  void updateCirclesForRouting(Coord rootCentre, double rootRadius, int level = 0);
+  void buildSampleTreeCascade(vector<Node>& sampleNodes, int level = 0);
+  void buildLocalTree(const vector<Node>& node, const vector<int>& route);
+  void buildRouteTree();
 
-        //CSampleTree sampleTree;
-        vector<CSampleTree> treeCascade; // first for sample tree, then for routing tree
-        CMPICascade cascade;
-  MPI_Comm communicator ;
+  //CSampleTree sampleTree;
+  vector<CSampleTree> treeCascade; // first for sample tree, then for routing tree
+  CMPICascade cascade;
+  ep_lib::MPI_Comm communicator ;
 
 };