Changeset 2269 for XIOS/dev/dev_ym/XIOS_COUPLING/extern/remap/src/node.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/node.hpp (modified) (4 diffs)

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

@@ -10 +10 @@
 
 #include "triple.hpp"
+#include <memory>
 
 namespace sphereRemap {
@@ -112 +113 @@
 //#endif
 
-typedef Node* NodePtr;
-
-struct Node
+//typedef Node* NodePtr;
+typedef std::shared_ptr<Node> NodePtr;
+
+struct Node : public std::enable_shared_from_this<Node>
 {
         int level; /* FIXME leafs are 0 and root is max level? */
@@ -120 +122 @@
         Coord centre;
         double radius;
-        NodePtr parent, ref;
+        std::weak_ptr<Node> parent ;
+        NodePtr ref;
         std::vector<NodePtr> child;
         std::list<NodePtr> intersectors;
@@ -198 +201 @@
         void printLevel(int level);
         void routeNode(NodePtr node, int level);
-        void routingIntersecting(std::vector<Node>* routingList, NodePtr node);
+        void routingIntersecting(std::vector<NodePtr>* routingList, NodePtr node);
         void routeIntersection(std::vector<int>& routes, NodePtr node);
   void getNodeLevel(int level,std::list<NodePtr>& NodeList) ;