Changeset 2603

Timestamp:

12/11/23 11:18:00 (5 months ago)

Author:

jderouillat

Message:

Replace the childList (not updated) usage by a childMap usage to get a Context from a string

Location:

XIOS3/trunk/src

Files:

• group_template.hpp (modified) (1 diff)
• group_template_impl.hpp (modified) (1 diff)
• interface/c/iccontext.cpp (modified) (2 diffs)
• node/context.cpp (modified) (3 diffs)

XIOS3/trunk/src/group_template.hpp

@@ -37 +37 @@
          /// Accesseurs ///
          const xios_map<StdString,Group*>& getGroupMap(void) const;
-         const vector<Child*>& getChildList(void) const;
+         const xios_map<StdString,Child*>& getChildMap(void) const;
 
          void getAllChildren(vector<Child*> & allc) const;

XIOS3/trunk/src/group_template_impl.hpp

@@ -229 +229 @@
 
    template <class U, class V, class W>
-      const std::vector<U*>&
-         CGroupTemplate<U, V, W>::getChildList(void) const
-   { 
-      return (this->childList); 
+      const xios_map<StdString, U*>&
+         CGroupTemplate<U, V, W>::getChildMap(void) const
+   { 
+      return (this->childMap); 
    }
 

XIOS3/trunk/src/interface/c/iccontext.cpp

@@ -38 +38 @@
       CTimer::get("XIOS").resume() ;
 
-      std::vector<xios::CContext*> def_vector =
-            xios::CContext::getRoot()->getChildList();
-
-      for (std::size_t i = 0; i < def_vector.size(); i++)
+      xios_map<StdString, CContext* > def_map =
+            xios::CContext::getRoot()->getChildMap();
+      
+      if (def_map.count(id))
       {
-          if (def_vector[i]->getId().compare(id) == 0)
-          {
-            *_ret = def_vector[i];
-             CTimer::get("XIOS").suspend() ;
-            return;
-          }
+        *_ret = def_map[id];
+        CTimer::get("XIOS").suspend() ;
+        return;
       }
        CTimer::get("XIOS").suspend() ;
@@ -93 +90 @@
 
       CTimer::get("XIOS").resume();
-      std::vector<xios::CContext*> def_vector =
-            xios::CContext::getRoot()->getChildList();
+
+      xios_map<StdString, CContext* > def_map =
+            xios::CContext::getRoot()->getChildMap();
 
       *_ret = false;
-      for (std::size_t i = 0; i < def_vector.size(); i++)
+      if (def_map.count(id))
       {
-        if (def_vector[i]->getId().compare(id) == 0)
-        {
-          *_ret = true;
-          break;
-        }
+        *_ret = true;
+        return;
       }
       CTimer::get("XIOS").suspend();

XIOS3/trunk/src/node/context.cpp

@@ -222 +222 @@
    {
       StdString currentContextId = CContext::getCurrent() -> getId();
-      std::vector<CContext*> def_vector =
-         CContext::getRoot()->getChildList();
-      std::vector<CContext*>::iterator
-         it = def_vector.begin(), end = def_vector.end();
+      std::map<StdString,CContext*> def_map =
+         CContext::getRoot()->getChildMap();
+      std::map<StdString,CContext*>::iterator
+         it = def_map.begin(), end = def_map.end();
 
       out << "<? xml version=\"1.0\" ?>" << std::endl;
@@ -232 +232 @@
       for (; it != end; it++)
       {
-         CContext* context = *it;
+         CContext* context = it->second;
          CContext::setCurrent(context->getId());
          out << *context << std::endl;
@@ -813 +813 @@
         xios::MPI_Comm_dup(interComm, &interCommServer) ;
         CContextClient* client = CContextClient::getNew(this, intraCommClient, interCommClient);
+              
         CContextServer* server = CContextServer::getNew(this, intraCommServer, interCommServer);
         client->setAssociatedServer(server) ;