Changeset 1331 for XIOS/dev/branch_openmp/src/cxios.cpp

Timestamp:

11/16/17 16:20:41 (6 years ago)

Author:

yushan

Message:

dev_omp

File:

• XIOS/dev/branch_openmp/src/cxios.cpp (modified) (3 diffs)

XIOS/dev/branch_openmp/src/cxios.cpp

@@ -15 +15 @@
 namespace xios
 {
-  string CXios::rootFile="./iodef.xml" ;
-  string CXios::xiosCodeId="xios.x" ;
-  string CXios::clientFile="./xios_client";
-  string CXios::serverFile="./xios_server";
+  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 ;
@@ -37 +37 @@
   {
     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();
   }
@@ -78 +86 @@
     if(isServer) 
     { 
-      num_ep = omp_get_num_threads();
+      num_ep = 1;
     }