Changeset 2269 for XIOS/dev/dev_ym/XIOS_COUPLING/extern/remap/src/tree.cpp

Timestamp:

12/07/21 12:00:23 (3 years ago)

Author:

ymipsl

Message:

• Solve memory leak from remapper.
• shared_ptr add add for manage nodes.

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/extern/remap/src/tree.cpp (modified) (9 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/extern/remap/src/tree.cpp

@@ -27 +27 @@
 */
 
-void CBasicTree::routeNodes(vector<int>& route, vector<Node>& nodes, int assignLevel)
+void CBasicTree::routeNodes(vector<int>& route, vector<NodePtr>& nodes, int assignLevel)
 {
         for (int i = 0; i < nodes.size(); i++)
         {
-                root->routeNode(&nodes[i], assignLevel);
-                route[i] = nodes[i].route;
-        }
-}
-
-void CBasicTree::routeIntersections(vector<vector<int> >& routes, vector<Node>& nodes)
+                root->routeNode(nodes[i], assignLevel);
+                route[i] = nodes[i]->route;
+        }
+}
+
+void CBasicTree::routeIntersections(vector<vector<int> >& routes, vector<NodePtr>& nodes)
 {
         for (int i = 0; i < nodes.size(); i++)
-                root->routeIntersection(routes[i], &nodes[i]);
-}
-
-void CBasicTree::build(vector<Node>& nodes)
+                root->routeIntersection(routes[i], nodes[i]);
+}
+
+void CBasicTree::build(vector<NodePtr>& nodes)
 {
         newRoot(1);
@@ -80 +80 @@
         push_back(node);
 
-        NodePtr q;
+        NodePtr q=make_shared<Node>();
         while (pool.size())
         {
@@ -88 +88 @@
                 if (ri)
                 {
-                        delete q;
+                        q.reset();
                         ri = 0;
                 }
@@ -103 +103 @@
                 if (ri)
                 {
-                        delete q;
+                        q.reset();
                         ri = 0;
                 }
@@ -137 +137 @@
 void CBasicTree::newRoot(int level)  // newroot <- root
 {
-        root = new Node;
+        root = make_shared<Node>();
         // if (level > 1) cout << " newRoot level " << level << endl;
         root->level = level;
-        root->parent = 0;
+        root->parent.reset() ;
         root->leafCount = 0;
 // initialize root node on the sphere
@@ -155 +155 @@
         //FIXME uncomment the next line and figure out why it segfault sometimes
         //root->free_descendants(); // recursively deletes all nodes in the tree
-        if (root) delete root;
-}
-
-void CTree::insertNodes(vector<Node>& nodes)
+        if (root) root.reset();
+}
+
+void CTree::insertNodes(vector<NodePtr>& nodes)
 {
         int stepSlim = MAX_NODE_SZ*MAX_NODE_SZ*2;
@@ -164 +164 @@
         for (int i = 0; i < nodes.size(); i++)
         {
-                insertNode(&nodes[i]);
+                insertNode(nodes[i]);
 
                 if (root->leafCount > stepSlim) // time for slim down
@@ -175 +175 @@
 
 
-void CSampleTree::insertNodes(vector<Node>& nodes)
+void CSampleTree::insertNodes(vector<NodePtr>& nodes)
 {
         bool first1 = true;
@@ -184 +184 @@
   int i ;
   
-//  cout<<"CSampleTree::insertNodes  : nb node to be inserted : "<<nodes.size()<<endl ;
   for (i = 0; i < nodes.size(); i++)
         {
-    insertNode(&nodes[i]);
+    insertNode(nodes[i]);
 
                 if (root->leafCount > stepSlim && levelSize[assignLevel] < keepNodes-2) // time for slim down