Changeset 2238 for XIOS/dev

Timestamp:

09/29/21 09:44:59 (3 years ago)

Author:

ymipsl

Message:

Bug fix in when split global communicator between clients and servers. Did'nt work with cyclic distribution of servers because it was assume than clients and servers partionning was contiguous
YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/client.cpp (modified) (2 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/client.cpp

@@ -90 +90 @@
           
           size_t* hashAll = new size_t[commSize] ;
-          MPI_Allgather(&hashClient,1,MPI_UNSIGNED_LONG,hashAll,1,MPI_LONG,globalComm) ;
+          MPI_Allgather(&hashClient,1,MPI_SIZE_T,hashAll,1,MPI_SIZE_T,globalComm) ;
           
           int color=0 ;
-          set<size_t> listHash ;
-          for(int i=0 ; i<=commRank ; i++) 
-            if (listHash.count(hashAll[i])==0)
+          map<size_t,int> listHash ;
+          for(int i=0 ; i<=commSize ; i++) 
+            if (listHash.count(hashAll[i])==0) 
             {
-              listHash.insert(hashAll[i]) ;
+              listHash[hashAll[i]]=color ;
               color=color+1 ;
             }
+            color=listHash[hashClient] ;
           delete[] hashAll ;
 
@@ -428 +429 @@
       int type=CServicesManager::CLIENT ;
       string name = CXios::getContextsManager()->getServerContextName(getPoolRessource()->getId(), id, 0, type, id) ;
-      while (!CXios::getContextsManager()->hasContext(name, contextComm) )
-      {
-        CXios::getDaemonsManager()->eventLoop() ;
+      double time ;
+      double lastTime=0 ;
+      double latency=1e-2 ;
+      bool out=false ;
+      while (!out)
+      {
+        time=MPI_Wtime() ;
+        if (time-lastTime > latency) 
+        {
+          out=CXios::getContextsManager()->hasContext(name, contextComm);
+          lastTime=time ;
+        }
+        if (!out) CXios::getDaemonsManager()->eventLoop() ;
       }