Changeset 1601 for XIOS/dev/dev_trunk_omp/src/node/context.hpp

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/node/context.hpp (modified) (5 diffs)

XIOS/dev/dev_trunk_omp/src/node/context.hpp

@@ -5 +5 @@
 #include "xios_spl.hpp"
 //#include "node_type.hpp"
+#include "mpi_std.hpp"
 #include "calendar_wrapper.hpp"
 
@@ -11 +12 @@
 #include "garbage_collector.hpp"
 #include "registry.hpp"
-#include "mpi.hpp"
 
 
@@ -88 +88 @@
       public :
          // Initialize server or client
-         void initClient(MPI_Comm intraComm, MPI_Comm interComm, CContext* cxtServer = 0);
-         void initServer(MPI_Comm intraComm, MPI_Comm interComm, CContext* cxtClient = 0);
+         void initClient(ep_lib::MPI_Comm intraComm, ep_lib::MPI_Comm interComm, CContext* cxtServer = 0);
+         void initServer(ep_lib::MPI_Comm intraComm, ep_lib::MPI_Comm interComm, CContext* cxtClient = 0);
          bool isInitialized(void);
 
@@ -239 +239 @@
 
          // Context root
-         static std::shared_ptr<CContextGroup> root;
+         static std::shared_ptr<CContextGroup> *root_ptr;
+         #pragma omp threadprivate(root_ptr)
 
          // Determine context on client or not
@@ -262 +263 @@
          StdString idServer_;
          CGarbageCollector garbageCollector;
-         std::list<MPI_Comm> comms; //!< Communicators allocated internally
+         std::list<ep_lib::MPI_Comm> comms; //!< Communicators allocated internally
 
       public: // Some function maybe removed in the near future