Changeset 1545 for XIOS/dev/branch_openmp/src/server.cpp

Timestamp:

06/18/18 20:32:55 (6 years ago)

Author:

yushan

Message:

branch_openmp merged with trunk r1544

File:

• XIOS/dev/branch_openmp/src/server.cpp (modified) (13 diffs)

XIOS/dev/branch_openmp/src/server.cpp

@@ -39 +39 @@
  * \fn void CServer::initialize(void)
  * Creates intraComm for each possible type of servers (classical, primary or secondary).
- * (For now the assumption is that there is one proc per secondary server pool.)
  * Creates interComm and stores them into the following lists:
  *   classical server -- interCommLeft
@@ -111 +110 @@
           else
           {
+            if (CXios::nbPoolsServer2 == 0) CXios::nbPoolsServer2 = reqNbProc;
             int firstSndSrvRank = srvRanks.size()*(100.-CXios::ratioServer2)/100. ;
             int poolLeader = firstSndSrvRank;
 //*********** (1) Comment out the line below to set one process per pool
-//            sndServerGlobalRanks.push_back(srvRanks[poolLeader]);
+            sndServerGlobalRanks.push_back(srvRanks[poolLeader]);
             int nbPools = CXios::nbPoolsServer2;
             if ( nbPools > reqNbProc || nbPools < 1)
@@ -140 +140 @@
                 }
 //*********** (2) Comment out the two lines below to set one process per pool
-//                if (poolLeader < srvRanks.size())
-//                  sndServerGlobalRanks.push_back(srvRanks[poolLeader]);
+                if (poolLeader < srvRanks.size())
+                  sndServerGlobalRanks.push_back(srvRanks[poolLeader]);
 //*********** (3) Uncomment the line below to set one process per pool
-                sndServerGlobalRanks.push_back(srvRanks[i]);
+//                sndServerGlobalRanks.push_back(srvRanks[i]);
               }
               else
@@ -189 +189 @@
               MPI_Comm_size(intraComm,&intraCommSize) ;
               MPI_Comm_rank(intraComm,&intraCommRank) ;
+
+              MPI_Intercomm_create(intraComm, 0, CXios::globalComm, clientLeader, 0, &newComm) ;
               #pragma omp critical (_output)
               {
@@ -195 +197 @@
               }
 
-              MPI_Intercomm_create(intraComm, 0, CXios::globalComm, clientLeader, 0, &newComm) ;
+              
               interCommLeft.push_back(newComm) ;
             }
@@ -213 +215 @@
               MPI_Comm_size(intraComm, &intraCommSize) ;
               MPI_Comm_rank(intraComm, &intraCommRank) ;
+              
+              MPI_Intercomm_create(intraComm, 0, CXios::globalComm, clientLeader, 0, &newComm) ;
               #pragma omp critical (_output)
               {
@@ -218 +222 @@
                        <<" intraCommRank :"<<intraCommRank<<"  clientLeader "<< clientLeader<<endl ;
               }
-              MPI_Intercomm_create(intraComm, 0, CXios::globalComm, clientLeader, 0, &newComm) ;
+
               interCommLeft.push_back(newComm) ;
             }
@@ -228 +232 @@
             MPI_Comm_size(intraComm, &intraCommSize) ;
             MPI_Comm_rank(intraComm, &intraCommRank) ;
+
+            MPI_Intercomm_create(intraComm, 0, CXios::globalComm, sndServerGlobalRanks[i], 1, &newComm) ;
             #pragma omp critical (_output)
             {
@@ -233 +239 @@
                 <<" intraCommRank :"<<intraCommRank<<"  clientLeader "<< sndServerGlobalRanks[i]<<endl ;
             }
-            MPI_Intercomm_create(intraComm, 0, CXios::globalComm, sndServerGlobalRanks[i], 1, &newComm) ;
+
             interCommRight.push_back(newComm) ;
           }
@@ -244 +250 @@
           MPI_Comm_size(intraComm, &intraCommSize) ;
           MPI_Comm_rank(intraComm, &intraCommRank) ;
+
+          MPI_Intercomm_create(intraComm, 0, CXios::globalComm, clientLeader, 1, &newComm) ;
           #pragma omp critical (_output)
           {
@@ -250 +258 @@
           }
 
-          MPI_Intercomm_create(intraComm, 0, CXios::globalComm, clientLeader, 1, &newComm) ;
           interCommLeft.push_back(newComm) ;
         }
@@ -654 +661 @@
        if (flag==true)
        {
-         int my_count;
          counts.push_back(0);
          MPI_Get_count(&status,MPI_CHAR,&(counts.back())) ;
          buffers.push_back(new char[counts.back()]) ;
-         //requests.push_back(request);
-         //MPI_Irecv((void*)(buffers.back()),counts.back(),MPI_CHAR,root,2,intraComm,&(requests.back())) ;
          MPI_Irecv((void*)(buffers.back()),counts.back(),MPI_CHAR,root,2,intraComm,&request) ;
          requests.push_back(request);
@@ -817 +821 @@
       if (!fb->is_open())
         ERROR("void CServer::openStream(const StdString& fileName, const StdString& ext, std::filebuf* fb)",
-              << std::endl << "Can not open <" << fileNameClient << "> file to write the server log(s).");
+              << std::endl << "Can not open <" << fileNameClient.str() << "> file to write the server log(s).");
     }