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

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.hpp (modified) (3 diffs)

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

@@ -20 +20 @@
         int ri; /** this is set to one by a node in case of reinsertion */
         vector<int> levelSize; /** e.g. levelSize[0] == leafs.size() */
-        vector<Node> leafs; /** leafs are stored in vector for easy access and rest of the tree nodes as separate allocations, only reachable through tree traversal */
+        vector<NodePtr> leafs; /** leafs are stored in vector for easy access and rest of the tree nodes as separate allocations, only reachable through tree traversal */
 
         CBasicTree() : ri(0), levelSize(MAX_LEVEL_SIZE), root(NULL), isAssignedLevel(false), okSplit(true), isActiveOkSplit(false) {} 
         ~CBasicTree(); 
-        void build(vector<Node>& nodes);
+        void build(vector<NodePtr>& nodes);
         void slim(int nbIts = 1);
-        virtual void insertNodes(vector<Node>& node) = 0;
+        virtual void insertNodes(vector<NodePtr>& node) = 0;
 
-        void routeNodes(vector<int>& route, vector<Node>& nodes, int assignLevel);
-        void routeIntersections(vector<vector<int> >& route, vector<Node>& nodes);
+        void routeNodes(vector<int>& route, vector<NodePtr>& nodes, int assignLevel);
+        void routeIntersections(vector<vector<int> >& route, vector<NodePtr>& nodes);
 
         void push_back(NodePtr node);
@@ -63 +63 @@
 {
 public:
-        void insertNodes(vector<Node>& nodes);
+        void insertNodes(vector<NodePtr>& nodes);
 };
 
@@ -73 +73 @@
   void slimAssignedLevel() ;
   void removeExtraNode(void) ;
-        void insertNodes(vector<Node>& nodes);
+        void insertNodes(vector<NodePtr>& nodes);
 };