Changeset 2243 for XIOS/dev/dev_ym/XIOS_COUPLING/src/object_template_impl.hpp

Timestamp:

10/01/21 10:40:31 (3 years ago)

Author:

jderouillat

Message:

Move context cleaning in xios_finalize (for clients) and when servers have finished their work

File:

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

XIOS/dev/dev_ym/XIOS_COUPLING/src/object_template_impl.hpp

@@ -68 +68 @@
       return (CObjectTemplate<T>::AllVectObj[contextId]);
    }
-   template <class T>
-      std::vector<std::shared_ptr<T> > *
-         CObjectTemplate<T>::GetAllVectobjectPtr(const StdString & contextId)
-   {
-      return &(CObjectTemplate<T>::AllVectObj[contextId]);
-   }
-
-  template <class T>
-      xios_map<StdString, xios_map<StdString, std::shared_ptr<T> > >*
-         CObjectTemplate<T>::GetAllMapobject()
-   {
-      return &(CObjectTemplate<T>::AllMapObj);
+  
+   template <class T>
+      void CObjectTemplate<T>::cleanStaticDataStructure(void)
+   {
+     xios_map<StdString, xios_map<StdString, std::shared_ptr<T> > >* allMap = &(CObjectTemplate<T>::AllMapObj);
+      for(auto it = allMap->begin(); it != allMap->end(); ++it)
+      {
+        for(auto it2 = it->second.begin(); it2 != it->second.end(); ++it2)
+        {
+          std::shared_ptr<T> todel = it2->second;
+          todel.reset();
+        }
+        it->second.clear();
+
+        std::vector<std::shared_ptr<T> >* allVect = &(CObjectTemplate<T>::AllVectObj[it->first]);
+        for(auto it = allVect->begin(); it != allVect->end(); ++it)
+        {
+          it->reset();
+        }
+        allVect->clear();
+      }
+      allMap->clear();
    }