Changeset 923 for XIOS/trunk/extern/remap/src/node.hpp

Timestamp:

08/26/16 15:07:20 (8 years ago)

Author:

ymipsl

Message:

Improve remapper :

• increase stability for smal grid remapping
• increase stability for large number of processes

YM

File:

• XIOS/trunk/extern/remap/src/node.hpp (modified) (4 diffs)

XIOS/trunk/extern/remap/src/node.hpp

@@ -128 +128 @@
         void *data;
         int route;
-
-        Node() : level(0), leafCount(1), centre(ORIGIN), radius(0), reinserted(false), updateCount(0) {}
+  bool toDelete ;
+
+        Node() : level(0), leafCount(1), centre(ORIGIN), radius(0), reinserted(false), updateCount(0), toDelete(false) {}
         Node(const Coord& centre, double radius, void *data)
-                : level(0), leafCount(1), centre(centre), radius(radius), reinserted(false), updateCount(0), data(data) {}
+                : level(0), leafCount(1), centre(centre), radius(radius), reinserted(false), updateCount(0), data(data), toDelete(false) {}
 
 //#ifdef DEBUG
@@ -191 +192 @@
         bool isInside(Node &node);
         int incluCheck();
+  void checkParent(void) ;
         void printChildren();
         void assignRoute(std::vector<int>::iterator& rank, int level);
@@ -198 +200 @@
         void routingIntersecting(std::vector<Node>* routingList, NodePtr node);
         void routeIntersection(std::vector<int>& routes, NodePtr node);
-
-        void free_descendants();
+  void getNodeLevel(int level,std::list<NodePtr>& NodeList) ;
+  bool removeDeletedNodes(int assignLevel) ;
+  void free_descendants();
 };
 
@@ -207 +210 @@
 NodePtr reinsert(NodePtr);
 NodePtr insert(NodePtr, NodePtr);
-void slim2(NodePtr thIs, int level);
+void slim2(NodePtr thIs, int level, int minNodeSize=MIN_NODE_SZ);
 
 }