Changeset 1545 for XIOS/dev/branch_openmp/src/client.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/client.cpp (modified) (7 diffs)

XIOS/dev/branch_openmp/src/client.cpp

@@ -18 +18 @@
     MPI_Comm CClient::intraComm ;
     MPI_Comm CClient::interComm ;
-    //std::list<MPI_Comm> CClient::contextInterComms;
     std::list<MPI_Comm> *CClient::contextInterComms_ptr = 0;
     int CClient::serverLeader ;
@@ -110 +109 @@
             MPI_Comm_size(intraComm,&intraCommSize) ;
             MPI_Comm_rank(intraComm,&intraCommRank) ;
+
+            MPI_Intercomm_create(intraComm, 0, CXios::globalComm, serverLeader, 0, &interComm) ;
             #pragma omp critical (_output)
             {
@@ -115 +116 @@
                    <<" intraCommRank :"<<intraCommRank<<"  clientLeader "<< serverLeader<<endl ;
             } 
-            MPI_Intercomm_create(intraComm, 0, CXios::globalComm, serverLeader, 0, &interComm) ;
-            //rank_ = intraCommRank;
+            
           }
           else
@@ -198 +198 @@
         CContext::setCurrent(id);
 
-        //contextInterComms.push_back(contextInterComm);
         if(contextInterComms_ptr == NULL) contextInterComms_ptr = new std::list<MPI_Comm>;
         contextInterComms_ptr->push_back(contextInterComm);
@@ -234 +233 @@
         context->initClient(contextComm,contextInterComm) ;
 
-        //contextInterComms.push_back(contextInterComm);
         if(contextInterComms_ptr == NULL) contextInterComms_ptr = new std::list<MPI_Comm>;
         contextInterComms_ptr->push_back(contextInterComm);
@@ -260 +258 @@
       }
 
-      //for (std::list<MPI_Comm>::iterator it = contextInterComms.begin(); it != contextInterComms.end(); it++)
       for (std::list<MPI_Comm>::iterator it = contextInterComms_ptr->begin(); it != contextInterComms_ptr->end(); it++)
         MPI_Comm_free(&(*it));
@@ -333 +330 @@
       if (!fb->is_open())
         ERROR("void CClient::openStream(const StdString& fileName, const StdString& ext, std::filebuf* fb)",
-              << std::endl << "Can not open <" << fileNameClient << "> file to write the client log(s).");
+              << std::endl << "Can not open <" << fileNameClient.str() << "> file to write the client log(s).");
     }