Changeset 1152 for XIOS/dev/dev_olga/src/client.cpp

Timestamp:

06/02/17 16:56:46 (7 years ago)

Author:

oabramkina

Message:

Two servel levels: correcting initialization in case of non-contiguous server ranks.
Tests on Curie: test_complete.

File:

• XIOS/dev/dev_olga/src/client.cpp (modified) (5 diffs)

XIOS/dev/dev_olga/src/client.cpp

@@ -41 +41 @@
       if (initialized) is_MPI_Initialized=true ;
       else is_MPI_Initialized=false ;
+      int rank ;
 
 // don't use OASIS
@@ -90 +91 @@
           {
             if (hashAll[i] == hashString(CXios::xiosCodeId))
-//                || (hashAll[i] == hashString(CXios::xiosCodeIdPrm))
-//                || (hashAll[i] == hashString(CXios::xiosCodeIdSnd)))
             {
               CXios::setUsingServer();
@@ -98 +97 @@
           }
 
-          myColor=colors[hashClient] ;
+//          myColor=colors[hashClient];
+          myColor=leaders[hashClient] ;
           MPI_Comm_split(CXios::globalComm,myColor,rank_,&intraComm) ;
+
+          if (CXios::usingServer2)
+            MPI_Allgather(&hashClient, 1, MPI_LONG, hashAll, 1, MPI_LONG, CXios::globalComm) ;
 
           if (CXios::usingServer)
@@ -111 +114 @@
                    <<" intraCommRank :"<<intraCommRank<<"  clientLeader "<< serverLeader<<endl ;
              MPI_Intercomm_create(intraComm, 0, CXios::globalComm, serverLeader, 0, &interComm) ;
-             rank_ = intraCommRank;
+             //rank_ = intraCommRank;
           }
           else
@@ -150 +153 @@
         {
           MPI_Status status ;
-          MPI_Comm_rank(intraComm,&rank_) ;
+          MPI_Comm_rank(intraComm,&rank) ;
 
           oasis_get_intercomm(interComm,CXios::xiosCodeId) ;
-          if (rank_==0) MPI_Recv(&serverLeader,1, MPI_INT, 0, 0, interComm, &status) ;
+          if (rank==0) MPI_Recv(&serverLeader,1, MPI_INT, 0, 0, interComm, &status) ;
           MPI_Bcast(&serverLeader,1,MPI_INT,0,intraComm) ;