Changeset 1601 for XIOS/dev/dev_trunk_omp/src/cxios.cpp

Timestamp:

11/19/18 15:52:54 (5 years ago)

Author:

yushan

Message:

branch_openmp merged with trunk r1597

File:

• XIOS/dev/dev_trunk_omp/src/cxios.cpp (modified) (7 diffs)

XIOS/dev/dev_trunk_omp/src/cxios.cpp

@@ -11 +11 @@
 #include "memtrack.hpp"
 #include "registry.hpp"
+using namespace ep_lib;
 
 namespace xios
 {
-  string CXios::rootFile="./iodef.xml" ;
-  string CXios::xiosCodeId="xios.x" ;
-  string CXios::clientFile="./xios_client";
-  string CXios::serverFile="./xios_server";
-  string CXios::serverPrmFile="./xios_server1";
-  string CXios::serverSndFile="./xios_server2";
+  const string CXios::rootFile="./iodef.xml" ;
+  const string CXios::xiosCodeId="xios.x" ;
+  const string CXios::clientFile="./xios_client";
+  const string CXios::serverFile="./xios_server";
+  const string CXios::serverPrmFile="./xios_server1";
+  const string CXios::serverSndFile="./xios_server2";
 
   bool CXios::isClient ;
@@ -43 +44 @@
   {
     set_new_handler(noMemory);
-    parseFile(rootFile);
+    int tmp_rank;
+    MPI_Comm_rank(MPI_COMM_WORLD, &tmp_rank);
+    #pragma omp critical
+    {
+      std::cout<<"thread "<<tmp_rank<<"("<<omp_get_thread_num()<<")"<<" parsing rootfile"<<std::endl;
+      parseFile(rootFile);
+      std::cout<<"thread "<<tmp_rank<<"("<<omp_get_thread_num()<<")"<<" parsed rootfile"<<std::endl;
+    }
+    #pragma omp barrier
     parseXiosConfig();
   }
@@ -81 +90 @@
     checkEventSync = getin<bool>("check_event_sync", checkEventSync);
 
-    globalComm=MPI_COMM_WORLD ;
+    //globalComm=MPI_COMM_WORLD ;
+    int num_ep;
+    if(isClient)  
+    { 
+      num_ep = omp_get_num_threads();
+    }
+        
+    if(isServer) 
+    { 
+      num_ep = 1;
+    }
+        
+    MPI_Info info;
+    #pragma omp master
+    {
+      MPI_Comm *ep_comm;
+      MPI_Comm_create_endpoints(MPI_COMM_WORLD->mpi_comm, num_ep, info, ep_comm);  // servers should reach here too.
+      passage = ep_comm; 
+    }
+        
+    #pragma omp barrier
+    
+          
+    CXios::globalComm = passage[omp_get_thread_num()];
   }
 
@@ -92 +124 @@
   void CXios::initClientSide(const string& codeId, MPI_Comm& localComm, MPI_Comm& returnComm)
   {
+    isClient = true;
+    isServer = false;
+
     initialize() ;
-
-    isClient = true;
 
     CClient::initialize(codeId,localComm,returnComm) ;
@@ -105 +138 @@
     if (printLogs2Files)
     {
+      #pragma omp critical
       CClient::openInfoStream(clientFile);
       CClient::openErrorStream(clientFile);
@@ -120 +154 @@
      if (CClient::getRank()==0)
      {
+       #pragma omp critical (_output)
        info(80)<<"Write data base Registry"<<endl<<globalRegistry->toString()<<endl ;
        globalRegistry->toFile("xios_registry.bin") ;
@@ -155 +190 @@
   void CXios::initServerSide(void)
   {
-    initServer();
+
     isClient = false;
     isServer = true;
+
+    initServer();
 
     // Initialize all aspects MPI