Changeset 1765 for XIOS/dev/dev_ym/XIOS_SERVICES/src/cxios.cpp

Timestamp:

11/06/19 11:03:38 (5 years ago)

Author:

ymipsl

Message:

Some cleaning On XIOS services branch

YM

File:

• XIOS/dev/dev_ym/XIOS_SERVICES/src/cxios.cpp (modified) (1 diff)

XIOS/dev/dev_ym/XIOS_SERVICES/src/cxios.cpp

@@ -180 +180 @@
 
     // Initialize all aspects MPI
-   // CServer::initialize();
-
     CServer::initialize();
-
-    //if (CServer::getRank()==0 && CServer::serverLevel != 1) globalRegistry = new CRegistry(CServer::intraComm) ;
-
-/*    
-    if (printLogs2Files)
-    {
-      if (CServer::serverLevel == 0)
-      {
-        CServer::openInfoStream(serverFile);
-        CServer::openErrorStream(serverFile);
-      }
-      else if (CServer::serverLevel == 1)
-      {
-        CServer::openInfoStream(serverPrmFile);
-        CServer::openErrorStream(serverPrmFile);
-      }
-      else
-      {
-        CServer::openInfoStream(serverSndFile);
-        CServer::openErrorStream(serverSndFile);
-      }
-    }
-    else
-    {
-      CServer::openInfoStream();
-      CServer::openErrorStream();
-    }
-
-    // Enter the loop to listen message from Client
-    CServer::eventLoop();
-*/
-    // Finalize
-/*    
-    if (CServer::serverLevel == 0)
-    {
-      if (CServer::getRank()==0)
-      {
-        info(80)<<"Write data base Registry"<<endl<<globalRegistry->toString()<<endl ;
-        globalRegistry->toFile("xios_registry.bin") ;
-        delete globalRegistry ;
-      }
-    }
-    else
-    {
-      // If using two server levels:
-      // (1) merge registries on each pool
-      // (2) send merged registries to the first pool
-      // (3) merge received registries on the first pool
-      if (CServer::serverLevel == 2)
-      {
-        vector<int>& secondaryServerGlobalRanks = CServer::getSecondaryServerGlobalRanks();
-        int firstPoolGlobalRank = secondaryServerGlobalRanks[0];
-        int rankGlobal;
-        MPI_Comm_rank(globalComm, &rankGlobal);
-
-        // Merge registries defined on each pools
-        CRegistry globalRegistrySndServers (CServer::intraComm);
-
-        // All pools (except the first): send globalRegistry to the first pool
-        for (int i=1; i<secondaryServerGlobalRanks.size(); i++)
-        {
-          if (rankGlobal == secondaryServerGlobalRanks[i])
-          {
-            globalRegistrySndServers.mergeRegistry(*globalRegistry) ;
-            int registrySize = globalRegistrySndServers.size();
-            MPI_Send(&registrySize,1,MPI_LONG,firstPoolGlobalRank,15,CXios::globalComm) ;
-            CBufferOut buffer(registrySize) ;
-            globalRegistrySndServers.toBuffer(buffer) ;
-            MPI_Send(buffer.start(),registrySize,MPI_CHAR,firstPoolGlobalRank,15,CXios::globalComm) ;
-          }
-        }
-
-        // First pool: receive globalRegistry of all secondary server pools, merge and write the resultant registry
-        if (rankGlobal == firstPoolGlobalRank)
-        {
-          MPI_Status status;
-          char* recvBuff;
-
-          globalRegistrySndServers.mergeRegistry(*globalRegistry) ;
-
-          for (int i=1; i< secondaryServerGlobalRanks.size(); i++)
-          {
-            int rank = secondaryServerGlobalRanks[i];
-            int registrySize = 0;
-            MPI_Recv(&registrySize, 1, MPI_LONG, rank, 15, CXios::globalComm, &status);
-            recvBuff = new char[registrySize];
-            MPI_Recv(recvBuff, registrySize, MPI_CHAR, rank, 15, CXios::globalComm, &status);
-            CBufferIn buffer(recvBuff, registrySize) ;
-            CRegistry recvRegistry;
-            recvRegistry.fromBuffer(buffer) ;
-            globalRegistrySndServers.mergeRegistry(recvRegistry) ;
-            delete[] recvBuff;
-          }
-
-          info(80)<<"Write data base Registry"<<endl<<globalRegistrySndServers.toString()<<endl ;
-          globalRegistrySndServers.toFile("xios_registry.bin") ;
-
-        }
-      }
-      delete globalRegistry;
-    }
-  */
-
     CServer::finalize();