Changeset 1134 for XIOS/dev/branch_yushan_merged/src/client.hpp

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/client.hpp (modified) (2 diffs)

XIOS/dev/branch_yushan_merged/src/client.hpp

@@ -12 +12 @@
         static void initialize(const string& codeId, MPI_Comm& localComm, MPI_Comm& returnComm);
         static void finalize(void);
-        static void registerContext(const string& id, MPI_Comm contextComm);
+        static void registerContext(const string& id, ep_lib::MPI_Comm contextComm);
 
         static MPI_Comm intraComm;
+        #pragma omp threadprivate(intraComm)
+
         static MPI_Comm interComm;
-        static std::list<MPI_Comm> contextInterComms;
+        #pragma omp threadprivate(interComm)
+
+        //static std::list<MPI_Comm> contextInterComms;
+        
+        static std::list<MPI_Comm> * contextInterComms_ptr;
+        #pragma omp threadprivate(contextInterComms_ptr)
+
         static int serverLeader;
+        #pragma omp threadprivate(serverLeader)
+
         static bool is_MPI_Initialized ;
+        #pragma omp threadprivate(is_MPI_Initialized)
 
         //! Get rank of the current process
@@ -39 +50 @@
       protected:
         static int rank;
+        #pragma omp threadprivate(rank)
+
         static StdOFStream m_infoStream;
+        #pragma omp threadprivate(m_infoStream) 
+
         static StdOFStream m_errorStream;
+        #pragma omp threadprivate(m_errorStream)
+
+        static StdOFStream array_infoStream[10];
 
         static void openStream(const StdString& fileName, const StdString& ext, std::filebuf* fb);