Changeset 2242 for XIOS/dev/dev_ym/XIOS_COUPLING/src/server.cpp

Timestamp:

09/30/21 16:37:30 (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 (missing file in commit)
YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/server.cpp (modified) (5 diffs)

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

@@ -58 +58 @@
       ///////////// PART 1 ////////////////////
       /////////////////////////////////////////
-
+      CTimer::get("XIOS").resume() ;
+      CTimer::get("XIOS initialize").resume() ;
       // don't use OASIS
       if (!CXios::usingOasis)
@@ -76 +77 @@
           
         size_t* hashAll = new size_t[commSize] ;
-        MPI_Allgather(&hashServer,1,MPI_UNSIGNED_LONG,hashAll,1,MPI_LONG,globalComm) ;
+        MPI_Allgather(&hashServer,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])==1)
+        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[hashServer] ;
         delete[] hashAll ;
 
@@ -94 +96 @@
         if (!is_MPI_Initialized) oasis_init(CXios::xiosCodeId);
 
-        CTimer::get("XIOS").resume() ;
         oasis_get_localcomm(serverComm);
       }
@@ -189 +190 @@
         }
       }
+      CTimer::get("XIOS initialize").suspend() ;
 
       /////////////////////////////////////////
@@ -196 +198 @@
 
       bool finished=false ;
+      CTimer::get("XIOS event loop").resume() ;
+
       while (!finished)
       {
         finished=daemonsManager->eventLoop() ;
       }
-
+      CTimer::get("XIOS event loop").suspend() ;
     }