Changeset 1180 for XIOS/dev/dev_olga/src/server.hpp

Timestamp:

06/22/17 17:03:07 (7 years ago)

Author:

oabramkina

Message:

Two server levels:
(1) oasis works now with two server levels
(2) corrected assignment of processes between two server levels in case of non-contiguous processes
(3) corrected a bug during context finalization.

File:

• XIOS/dev/dev_olga/src/server.hpp (modified) (3 diffs)

XIOS/dev/dev_olga/src/server.hpp

@@ -25 +25 @@
 
         static MPI_Comm intraComm;
-        static list<MPI_Comm> interCommLeft;           // interComm between server (primary, classical or secondary) and its client (client or primary server)
-        static list<MPI_Comm> interCommRight;          // interComm between primary server and secondary server (non-empty only for primary server pool)
+        static std::list<MPI_Comm> interCommLeft;           // interComm between server (primary, classical or secondary) and its client (client or primary server)
+        static std::list<MPI_Comm> interCommRight;          // interComm between primary server and secondary server (non-empty only for primary server pool)
         static std::list<MPI_Comm> contextInterComms;  // list of context intercomms
         static std::list<MPI_Comm> contextIntraComms;  // list of context intercomms (needed only in case of secondary servers)
@@ -49 +49 @@
         static int getRank();
 
-        //!< Get global ranks of processes dedicated to the secondary server
+        //!< Get global ranks of secondary server processes
         static vector<int>& getSecondaryServerGlobalRanks();
 
@@ -68 +68 @@
       private:
         static vector<int> sndServerGlobalRanks;  //!< Global ranks of secondary server processes
-        static int rank_;             //!< If (!oasis) global rank, else rank in the intraComm returned by oasis
-        static int nbContexts;        //!< Number of contexts registered by server
+        static int rank_;                   //!< If (!oasis) global rank, else rank in the intraComm returned by oasis
+        static int nbContexts;              //!< Number of contexts registered by server
         static StdOFStream m_infoStream;
         static StdOFStream m_errorStream;