Changeset 1134 for XIOS/dev/branch_yushan_merged/src/cxios.cpp

Timestamp:

05/16/17 17:54:30 (7 years ago)

Author:

yushan

Message:

branch merged with trunk r1130

File:

• XIOS/dev/branch_yushan_merged/src/cxios.cpp (modified) (9 diffs)

XIOS/dev/branch_yushan_merged/src/cxios.cpp

@@ -14 +14 @@
 namespace xios
 {
-  string CXios::rootFile="./iodef.xml" ;
-  string CXios::xiosCodeId="xios.x" ;
-  string CXios::clientFile="./xios_client";
-  string CXios::serverFile="./xios_server";
+
+  extern int test_omp_rank;
+  #pragma omp threadprivate(test_omp_rank)
+
+  const string CXios::rootFile="./iodef.xml" ;
+  const string CXios::xiosCodeId="xios.x" ;
+  const string CXios::clientFile="./xios_client";
+  const string CXios::serverFile="./xios_server";
+
 
   bool CXios::isClient ;
   bool CXios::isServer ;
+
+
   MPI_Comm CXios::globalComm ;
+
+  
   bool CXios::usingOasis ;
   bool CXios::usingServer = false;
+
+
   double CXios::bufferSizeFactor = 1.0;
   const double CXios::defaultBufferSizeFactor = 1.0;
   StdSize CXios::minBufferSize = 1024 * sizeof(double);
+
+
   bool CXios::printLogs2Files;
   bool CXios::isOptPerformance = true;
@@ -36 +49 @@
   {
     set_new_handler(noMemory);
-    parseFile(rootFile);
+    
+    
+    #pragma omp critical
+    {
+      parseFile(rootFile);  
+    }
+    #pragma omp barrier
     parseXiosConfig();
   }
@@ -68 +87 @@
       ERROR("CXios::parseXiosConfig()", "recv_field_timeout cannot be negative.");
 
-    globalComm=MPI_COMM_WORLD ;
+ 
+    int num_ep;
+    if(isClient)  
+    { 
+      num_ep = omp_get_num_threads();
+    }
+    
+    if(isServer) 
+    { 
+      num_ep = omp_get_num_threads();
+    }
+    
+    MPI_Info info;
+    #pragma omp master
+    {
+      MPI_Comm *ep_comm;
+      MPI_Comm_create_endpoints(MPI_COMM_WORLD, num_ep, info, ep_comm);  // servers should reach here too.
+      passage = ep_comm;  
+    }
+    
+    #pragma omp barrier
+
+      
+    CXios::globalComm = passage[omp_get_thread_num()];
+
+    int tmp_rank;
+    MPI_Comm_rank(CXios::globalComm, &tmp_rank);
+
+    
+    test_omp_rank = tmp_rank;
+    
   }
 
@@ -79 +128 @@
   void CXios::initClientSide(const string& codeId, MPI_Comm& localComm, MPI_Comm& returnComm)
   {
+    isClient = true;
+    
     initialize() ;
 
-    isClient = true;
-
     CClient::initialize(codeId,localComm,returnComm) ;
+
     if (CClient::getRank()==0) globalRegistry = new CRegistry(returnComm) ;
 
@@ -92 +142 @@
     if (printLogs2Files)
     {
+      #pragma omp critical
       CClient::openInfoStream(clientFile);
       CClient::openErrorStream(clientFile);
@@ -107 +158 @@
      if (CClient::getRank()==0)
      {
+       #pragma omp critical (_output)
        info(80)<<"Write data base Registry"<<endl<<globalRegistry->toString()<<endl ;
        globalRegistry->toFile("xios_registry.bin") ;
@@ -123 +175 @@
   void CXios::initServer()
   {
+    int initialized;
+    MPI_Initialized(&initialized);
+    if (initialized) CServer::is_MPI_Initialized=true ;
+    else CServer::is_MPI_Initialized=false ;
+      
+ 
+    if(!CServer::is_MPI_Initialized)
+    {
+      MPI_Init(NULL, NULL);
+    }
+      
     set_new_handler(noMemory);
     std::set<StdString> parseList;
@@ -133 +196 @@
   void CXios::initServerSide(void)
   {
-    initServer();
+    
     isClient = false;
     isServer = true;
-
+    
+    initServer();
+    
+    
     // Initialize all aspects MPI
     CServer::initialize();
@@ -162 +228 @@
        delete globalRegistry ;
      }
+
     CServer::finalize();
+        
     CServer::closeInfoStream();
   }