Changeset 2332

Timestamp:

06/08/22 10:11:52 (12 months ago)

Author:

jderouillat

Message:

Suffix intraComm and interComm members of CClient and CServer with _ (some occurrences of these varaiables exist locally).

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src

Files:

• client.cpp (modified) (3 diffs)
• client.hpp (modified) (1 diff)
• server.cpp (modified) (1 diff)
• server.hpp (modified) (1 diff)

XIOS/dev/dev_ym/XIOS_COUPLING/src/client.cpp

@@ -24 +24 @@
     const double serverPublishDefaultTimeout=10;
 
-    MPI_Comm CClient::intraComm ;
-    MPI_Comm CClient::interComm ;
+    MPI_Comm CClient::intraComm_ ;
+    MPI_Comm CClient::interComm_ ;
     MPI_Comm CClient::clientsComm_ ;
 
@@ -36 +36 @@
     CPoolRessource* CClient::poolRessource_=nullptr ;
 
-    MPI_Comm& CClient::getInterComm(void)   { return (interComm); }
+    MPI_Comm& CClient::getInterComm(void)   { return (interComm_); }
      
 ///---------------------------------------------------------------
@@ -469 +469 @@
         int msg=0 ;
 
-        MPI_Comm_rank(intraComm,&rank) ;
+        MPI_Comm_rank(intraComm_,&rank) ;
         if (rank==0) 
         {
-          MPI_Send(&msg,1,MPI_INT,0,5,interComm) ; // tags oasis_endded = 5
+          MPI_Send(&msg,1,MPI_INT,0,5,interComm_) ; // tags oasis_endded = 5
         }
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/client.hpp

@@ -19 +19 @@
         static void callOasisEnddef(void) ; 
         
-        static MPI_Comm intraComm;
-        static MPI_Comm interComm;
+        static MPI_Comm intraComm_;
+        static MPI_Comm interComm_;
         static std::list<MPI_Comm> contextInterComms;
         static int serverLeader;

XIOS/dev/dev_ym/XIOS_COUPLING/src/server.cpp

@@ -27 +27 @@
 namespace xios
 {
-    MPI_Comm CServer::intraComm ;
+    MPI_Comm CServer::intraComm_ ;
     MPI_Comm CServer::serversComm_ ;
     std::list<MPI_Comm> CServer::interCommLeft ;

XIOS/dev/dev_ym/XIOS_COUPLING/src/server.hpp

@@ -22 +22 @@
         static void eventLoop(void);
         
-        static MPI_Comm intraComm;
+        static MPI_Comm intraComm_;
         static MPI_Comm serversComm_;
         static std::list<MPI_Comm> interCommLeft;           // interComm between server (primary, classical or secondary) and its client (client or primary server)