Changeset 2267 for XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/grid_elements.hpp

Timestamp:

12/01/21 16:52:24 (3 years ago)

Author:

ymipsl

Message:

tracking memory leak
Elements, views, and connectors are now managed with shared pointer.
YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/grid_elements.hpp (modified) (1 diff)

XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/grid_elements.hpp

@@ -11 +11 @@
   class CGridLocalConnector ;
 
-  class CGridLocalElements  
+  class CGridLocalElements : public std::enable_shared_from_this<CGridLocalElements>
   {
     private:
-      std::vector<CLocalElement*> elements_ ;
-      std::vector<CGridLocalView*> views_= std::vector<CGridLocalView*>(CElementView::numViewType_) ;
-      std::map<pair<CElementView::type,CElementView::type>, CGridLocalConnector*> connectors_ ;
+      std::vector<shared_ptr<CLocalElement>> elements_ ;
+      std::vector<shared_ptr<CGridLocalView>> views_= std::vector<shared_ptr<CGridLocalView>>(CElementView::numViewType_) ;
+      std::map<pair<CElementView::type,CElementView::type>, shared_ptr<CGridLocalConnector>> connectors_ ;
       vector<bool> localMask_ ;
   
     public:
-      CGridLocalElements(vector<CLocalElement*> elements) : elements_(elements) {}
-      CGridLocalElements(vector<CLocalElement*> elements, vector<bool>& localMask) : elements_(elements), localMask_(localMask) {}
+      CGridLocalElements(vector<shared_ptr<CLocalElement> > elements) : elements_(elements) {}
+      CGridLocalElements(vector<shared_ptr<CLocalElement>> elements, vector<bool>& localMask) : elements_(elements), localMask_(localMask) {}
 
       bool hasLocalMask() { return !localMask_.empty() ;}
       vector<bool>& getLocalMask(void) { return localMask_ ;}
 
-      std::vector<CLocalElement*>& getElements(void) { return elements_ ; }
-      CGridLocalView* getView(CElementView::type type) ;
-      CGridLocalConnector* getConnector(CElementView::type srcType, CElementView::type dstType, bool withMask=false) ;
+      std::vector<shared_ptr<CLocalElement>>& getElements(void) { return elements_ ; }
+      shared_ptr<CGridLocalView> getView(CElementView::type type) ;
+      shared_ptr<CGridLocalConnector> getConnector(CElementView::type srcType, CElementView::type dstType, bool withMask=false) ;
   } ;
 }