Changeset 2267 for XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/grid_local_connector.cpp

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

XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/grid_local_connector.cpp

@@ -8 +8 @@
 {
  
-  CGridLocalConnector::CGridLocalConnector(const std::vector<CLocalConnector*>& elementsConnector) : elementsConnector_(elementsConnector)
+  CGridLocalConnector::CGridLocalConnector(const std::vector<shared_ptr<CLocalConnector>>& elementsConnector) : elementsConnector_(elementsConnector)
   {
     srcSize_=1 ;
@@ -16 +16 @@
   } 
 
-  CGridLocalConnector::CGridLocalConnector(CGridLocalElements* parent, CElementView::type srcType, CElementView::type dstType, bool withMask)
+  CGridLocalConnector::CGridLocalConnector(shared_ptr<CGridLocalElements> parent, CElementView::type srcType, CElementView::type dstType, bool withMask)
   {
-    CGridLocalView* srcView=parent->getView(srcType) ;
-    CGridLocalView* dstView=parent->getView(dstType) ;
+    shared_ptr<CGridLocalView> srcView=parent->getView(srcType) ;
+    shared_ptr<CGridLocalView> dstView=parent->getView(dstType) ;
 
-    vector<CLocalView*> srcViews = srcView->getViews() ; 
-    vector<CLocalView*> dstViews = dstView->getViews() ;
+    vector<shared_ptr<CLocalView>> srcViews = srcView->getViews() ; 
+    vector<shared_ptr<CLocalView>> dstViews = dstView->getViews() ;
     
-    vector<CLocalElement*>& elements = parent->getElements();
+    vector<shared_ptr<CLocalElement>>& elements = parent->getElements();
     for(auto element : elements) elementsConnector_.push_back(element->getConnector(srcType, dstType)) ;
     srcSize_=1 ;
@@ -33 +33 @@
     if (parent->hasLocalMask() && withMask)
     {
-      vector<CLocalConnector*> elementsConnector ;
+      vector<shared_ptr<CLocalConnector>> elementsConnector ;
       for(auto element : elements) elementsConnector.push_back(element->getConnector(CElementView::FULL, dstType)) ;
-      CGridLocalConnector localToDst(elementsConnector) ;
-      CArray<bool,1> maskIn(localToDst.getSrcSize()) ;
-      CArray<bool,1> maskOut1(localToDst.getDstSize()) ;
-      CArray<bool,1> maskOut2(localToDst.getDstSize()) ;
+      auto localToDst=make_shared<CGridLocalConnector>(elementsConnector) ;
+      CArray<bool,1> maskIn(localToDst->getSrcSize()) ;
+      CArray<bool,1> maskOut1(localToDst->getDstSize()) ;
+      CArray<bool,1> maskOut2(localToDst->getDstSize()) ;
       maskIn=true ;
-      localToDst.transfer(maskIn,maskOut1,false) ;
+      localToDst->transfer(maskIn,maskOut1,false) ;
       auto& localMask = parent->getLocalMask() ;
       for(int i=0 ; i < maskIn.numElements() ; i++) maskIn(i)=localMask[i] ;
-      localToDst.transfer(maskIn,maskOut2,false) ;
+      localToDst->transfer(maskIn,maskOut2,false) ;
       mask_.assign(dstSize_,true) ;
       for(int i=0;i<dstSize_;i++) if (maskOut1(i)==true && maskOut2(i)==false) mask_[i]=false ;