Changeset 1460 for XIOS/dev/branch_openmp/src/client.hpp

Timestamp:

03/22/18 10:43:20 (6 years ago)

Author:

yushan

Message:

branch_openmp merged with XIOS_DEV_CMIP6@1459

File:

• XIOS/dev/branch_openmp/src/client.hpp (modified) (3 diffs)

XIOS/dev/branch_openmp/src/client.hpp

@@ -16 +16 @@
       static ep_lib::MPI_Comm intraComm;
       #pragma omp threadprivate(intraComm)
-   
+
       static ep_lib::MPI_Comm interComm;
       #pragma omp threadprivate(interComm)
@@ -26 +26 @@
       static int serverLeader;
       #pragma omp threadprivate(serverLeader)
-      
+
       static bool is_MPI_Initialized ;
       #pragma omp threadprivate(is_MPI_Initialized)
 
-      //! Get rank of the current process
+      static ep_lib::MPI_Comm& getInterComm();
+
+      //! Get global rank without oasis and current rank in model intraComm in case of oasis
       static int getRank();
 
@@ -48 +50 @@
 
     protected:
-      static int rank;
-      #pragma omp threadprivate(rank)
+      static int rank_;                 //!< Rank in model intraComm
+      #pragma omp threadprivate(rank_)
 
       static StdOFStream m_infoStream;