Changeset 1639 for XIOS/trunk/src/cxios.cpp

Timestamp:

01/22/19 16:43:32 (5 years ago)

Author:

yushan

Message:

revert erroneous commit on trunk

File:

• XIOS/trunk/src/cxios.cpp (modified) (8 diffs)

XIOS/trunk/src/cxios.cpp

@@ -26 +26 @@
   bool CXios::isClient ;
   bool CXios::isServer ;
-  ep_lib::MPI_Comm CXios::globalComm ;
+  MPI_Comm CXios::globalComm ;
   bool CXios::usingOasis ;
   bool CXios::usingServer = false;
@@ -90 +90 @@
 
     checkEventSync = getin<bool>("check_event_sync", checkEventSync);
-    #ifdef _usingMPI
+
     globalComm=MPI_COMM_WORLD ;
-    #elif _usingEP
-    ep_lib::MPI_Comm *ep_comm;
-    ep_lib::MPI_Info info;
-    ep_lib::MPI_Comm_create_endpoints(EP_COMM_WORLD->mpi_comm, 1, info, ep_comm);
-    ep_lib::passage = ep_comm;
-    globalComm=ep_lib::passage[0] ;
-    #endif
   }
 
@@ -107 +100 @@
   \param [in/out] returnComm communicator corresponding to group of client with same codeId
   */
-  void CXios::initClientSide(const string& codeId, ep_lib::MPI_Comm& localComm, ep_lib::MPI_Comm& returnComm)
+  void CXios::initClientSide(const string& codeId, MPI_Comm& localComm, MPI_Comm& returnComm)
   TRY
   {
+    initialize() ;
+
     isClient = true;
-    isServer = false;
-
-    initialize() ;
-
 
     CClient::initialize(codeId,localComm,returnComm) ;
     if (CClient::getRank()==0) globalRegistry = new CRegistry(returnComm) ;
-
 
     // If there are no server processes then we are in attached mode
@@ -177 +167 @@
   void CXios::initServerSide(void)
   {
-    isClient = false;
-    isServer = true;
-
     initServer();
     isClient = false;
     isServer = true;
+
     // Initialize all aspects MPI
     CServer::initialize();
@@ -235 +223 @@
         int firstPoolGlobalRank = secondaryServerGlobalRanks[0];
         int rankGlobal;
-        ep_lib::MPI_Comm_rank(globalComm, &rankGlobal);
+        MPI_Comm_rank(globalComm, &rankGlobal);
 
         // Merge registries defined on each pools
@@ -247 +235 @@
             globalRegistrySndServers.mergeRegistry(*globalRegistry) ;
             int registrySize = globalRegistrySndServers.size();
-            ep_lib::MPI_Send(&registrySize,1,EP_LONG,firstPoolGlobalRank,15,CXios::globalComm) ;
+            MPI_Send(&registrySize,1,MPI_LONG,firstPoolGlobalRank,15,CXios::globalComm) ;
             CBufferOut buffer(registrySize) ;
             globalRegistrySndServers.toBuffer(buffer) ;
-            ep_lib::MPI_Send(buffer.start(),registrySize,EP_CHAR,firstPoolGlobalRank,15,CXios::globalComm) ;
+            MPI_Send(buffer.start(),registrySize,MPI_CHAR,firstPoolGlobalRank,15,CXios::globalComm) ;
           }
         }
@@ -257 +245 @@
         if (rankGlobal == firstPoolGlobalRank)
         {
-          ep_lib::MPI_Status status;
+          MPI_Status status;
           char* recvBuff;
 
@@ -266 +254 @@
             int rank = secondaryServerGlobalRanks[i];
             int registrySize = 0;
-            ep_lib::MPI_Recv(&registrySize, 1, EP_LONG, rank, 15, CXios::globalComm, &status);
+            MPI_Recv(&registrySize, 1, MPI_LONG, rank, 15, CXios::globalComm, &status);
             recvBuff = new char[registrySize];
-            ep_lib::MPI_Recv(recvBuff, registrySize, EP_CHAR, rank, 15, CXios::globalComm, &status);
+            MPI_Recv(recvBuff, registrySize, MPI_CHAR, rank, 15, CXios::globalComm, &status);
             CBufferIn buffer(recvBuff, registrySize) ;
             CRegistry recvRegistry;