Changeset 1072 for XIOS/dev/branch_yushan/src/client.cpp

Timestamp:

03/14/17 19:12:25 (7 years ago)

Author:

yushan

Message:

Using threads : modif for xios_initialize

File:

• XIOS/dev/branch_yushan/src/client.cpp (modified) (4 diffs)

XIOS/dev/branch_yushan/src/client.cpp

@@ -39 +39 @@
           if (!is_MPI_Initialized)
           {
-            MPI_Init(NULL, NULL);
+            //MPI_Init(NULL, NULL);
+            int return_level;
+            MPI_Init_thread(NULL, NULL, 3, &return_level);
+            assert(return_level == 3);
           }
           CTimer::get("XIOS").resume() ;
@@ -46 +49 @@
 
           unsigned long hashClient=hashString(codeId) ;
-          unsigned long hashServer=hashString(CXios::xiosCodeId) ;
+          unsigned long hashServer; //=hashString(CXios::xiosCodeId) ;
+          hashServer=hashString("xios.x") ;
           unsigned long* hashAll ;
           int size ;
@@ -96 +100 @@
             MPI_Comm_size(intraComm,&intraCommSize) ;
             MPI_Comm_rank(intraComm,&intraCommRank) ;
-            info(50)<<"intercommCreate::client "<<rank<<" intraCommSize : "<<intraCommSize
-                 <<" intraCommRank :"<<intraCommRank<<"  serverLeader "<< serverLeader<<endl ;
+            #pragma omp critical(_output)
+            {
+              info(50)<<"intercommCreate::client "<<rank<<" intraCommSize : "<<intraCommSize
+                 <<" intraCommRank :"<<intraCommRank<<"  serverLeader "<< serverLeader<<endl ;  
+            }
+            
             MPI_Intercomm_create(intraComm,0,CXios::globalComm,serverLeader,0,&interComm) ;
+
           }
           else
@@ -289 +298 @@
 
       fileNameClient << fileName << "_" << std::setfill('0') << std::setw(numDigit) << getRank() << ext;
-      fb->open(fileNameClient.str().c_str(), std::ios::out);
-      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).");
+      printf("getrank() = %d, file name = %s\n", getRank(), fileNameClient.str().c_str());
+      #pragma omp critical(_output)
+      {
+        fb->open(fileNameClient.str().c_str(), std::ios::out);
+        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).");  
+      }
+      
     }