Changeset 1353 for XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.cpp

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

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.cpp (modified) (7 diffs)

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);
+    }
   }