Changeset 1353 for XIOS

Timestamp:

12/04/17 15:53:53 (6 years ago)

Author:

ymipsl

Message:

Bug fix : Assigned context client to grid/axis/domain was not in same order for each process, causing synchronisation problems.

YM

Location:

XIOS/dev/XIOS_DEV_CMIP6/src/node

Files:

• axis.cpp (modified) (4 diffs)
• axis.hpp (modified) (1 diff)
• domain.cpp (modified) (7 diffs)
• domain.hpp (modified) (1 diff)
• grid.cpp (modified) (3 diffs)
• grid.hpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/src/node/axis.cpp

@@ -842 +842 @@
                                         CServerDistributionDescription::ServerDistributionType distType)
   {
-    std::set<CContextClient*>::iterator it;
+    std::list<CContextClient*>::iterator it;
     for (it=clients.begin(); it!=clients.end(); ++it)
     {
@@ -960 +960 @@
   void CAxis::sendNonDistributedAttributes()
   {
-    std::set<CContextClient*>::iterator it;
+    std::list<CContextClient*>::iterator it;
     for (it=clients.begin(); it!=clients.end(); ++it)
         {
@@ -1084 +1084 @@
   {
     int ns, n, i, j, ind, nv, idx;
-    std::set<CContextClient*>::iterator it;
+    std::list<CContextClient*>::iterator it;
 
     for (it=clients.begin(); it!=clients.end(); ++it)
@@ -1441 +1441 @@
   void CAxis::setContextClient(CContextClient* contextClient)
   {
-    clients.insert(contextClient);
-  }
+    if (clientsSet.find(contextClient)==clientsSet.end())
+    {
+      clients.push_back(contextClient) ;
+      clientsSet.insert(contextClient);
+    }
+}
 
   void CAxis::parse(xml::CXMLNode & node)

XIOS/dev/XIOS_DEV_CMIP6/src/node/axis.hpp

@@ -154 +154 @@
 
 /** Clients that have to send a domain. There can be multiple clients in case of secondary server, otherwise only one client. */
-         std::set<CContextClient*> clients;
+         std::list<CContextClient*> clients;
+         std::set<CContextClient*> clientsSet;
 
          bool isChecked;

XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.cpp

@@ -2060 +2060 @@
   {
     int ns, n, i, j, ind, nv, idx;
-    std::set<CContextClient*>::iterator it;
+    std::list<CContextClient*>::iterator it;
     for (it=clients.begin(); it!=clients.end(); ++it)
     {
@@ -2108 +2108 @@
   void CDomain::sendDistributionAttributes(void)
   {
-    std::set<CContextClient*>::iterator it;
+    std::list<CContextClient*>::iterator it;
     for (it=clients.begin(); it!=clients.end(); ++it)
     {
@@ -2159 +2159 @@
   {
     int ns, n, i, j, ind, nv, idx;
-    std::set<CContextClient*>::iterator it;
+    std::list<CContextClient*>::iterator it;
     for (it=clients.begin(); it!=clients.end(); ++it)
     {
@@ -2205 +2205 @@
 
     int ns, n, i, j, ind, nv, idx;
-    std::set<CContextClient*>::iterator it;
+    std::list<CContextClient*>::iterator it;
 
     for (it=clients.begin(); it!=clients.end(); ++it)
@@ -2255 +2255 @@
 
     int ns, n, i, j, ind, nv, idx;
-    std::set<CContextClient*>::iterator it;
+    std::list<CContextClient*>::iterator it;
     for (it=clients.begin(); it!=clients.end(); ++it)
     {
@@ -2349 +2349 @@
   {
     int ns, n, i, j, ind, nv, idx;
-    std::set<CContextClient*>::iterator it;
+    std::list<CContextClient*>::iterator it;
     for (it=clients.begin(); it!=clients.end(); ++it)
     {
@@ -3109 +3109 @@
   void CDomain::setContextClient(CContextClient* contextClient)
   {
-    clients.insert(contextClient);
+    if (clientsSet.find(contextClient)==clientsSet.end())
+    {
+      clients.push_back(contextClient) ;
+      clientsSet.insert(contextClient);
+    }
   }
 

XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.hpp

@@ -203 +203 @@
 
 /** Clients that have to send a domain. There can be multiple clients in case of secondary server, otherwise only one client. */
-         std::set<CContextClient*> clients;
+         std::list<CContextClient*> clients;
+         std::set<CContextClient*> clientsSet;
 
          bool doZoomByIndex_;

XIOS/dev/XIOS_DEV_CMIP6/src/node/grid.cpp

@@ -1348 +1348 @@
     CContext* context = CContext::getCurrent();
     storeIndex_toSrv.clear();
-    std::set<CContextClient*>::iterator it;
+    std::list<CContextClient*>::iterator it;
 
     for (it=clients.begin(); it!=clients.end(); ++it)
@@ -1413 +1413 @@
     CContext* context = CContext::getCurrent();
     storeIndex_toSrv.clear();
-    std::set<CContextClient*>::iterator it;
+    std::list<CContextClient*>::iterator it;
 
     for (it=clients.begin(); it!=clients.end(); ++it)
@@ -2508 +2508 @@
   void CGrid::setContextClient(CContextClient* contextClient)
   {
-    clients.insert(contextClient);
+    if (clientsSet.find(contextClient)==clientsSet.end())
+    {
+      clients.push_back(contextClient) ;
+      clientsSet.insert(contextClient);
+    }
     for (int i=0; i<this->getDomains().size(); i++)
         this->getDomains()[i]->setContextClient(contextClient);

XIOS/dev/XIOS_DEV_CMIP6/src/node/grid.hpp

@@ -304 +304 @@
 
 /** Clients that have to send a grid. There can be multiple clients in case of secondary server, otherwise only one client. */
-        std::set<CContextClient*> clients;
+        std::list<CContextClient*> clients;
+        std::set<CContextClient*> clientsSet;
 
         bool isChecked;