Changeset 1243 for XIOS/dev/XIOS_DEV_CMIP6/src/cxios.cpp

Timestamp:

08/28/17 12:15:49 (7 years ago)

Author:

oabramkina

Message:

Modifications allowing secondary-server pools of different size. It's controlled by a new parameter number_pools_server2.
Tests: complete, toy, ipsl.

This functionality is to be used in future. For now it is disabled and XIOS works as before with one process assigned per pool.

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/cxios.cpp (modified) (4 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/cxios.cpp

@@ -28 +28 @@
   bool CXios::usingServer2 = false;
   int CXios::ratioServer2 = 50;
+  int CXios::nbPoolsServer2 = 1;
   double CXios::bufferSizeFactor = 1.0;
   const double CXios::defaultBufferSizeFactor = 1.0;
@@ -55 +56 @@
     usingServer2=getin<bool>("using_server2",false) ;
     ratioServer2=getin<int>("ratio_server2",50);
+    nbPoolsServer2=getin<int>("number_pools_server2",1);
     info.setLevel(getin<int>("info_level",0)) ;
     report.setLevel(getin<int>("info_level",50));
@@ -197 +199 @@
     else
     {
-      // If using two server levels, first merge globalRegistry of each server pool into one registry on the first pool
+      // 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)
       {
@@ -205 +210 @@
         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
-        if (rankGlobal != firstPoolGlobalRank)
+        for (int i=1; i<secondaryServerGlobalRanks.size(); i++)
         {
-          int registrySize = globalRegistry->size();
-          MPI_Send(&registrySize,1,MPI_LONG,firstPoolGlobalRank,15,CXios::globalComm) ;
-          CBufferOut buffer(registrySize) ;
-          globalRegistry->toBuffer(buffer) ;
-          MPI_Send(buffer.start(),registrySize,MPI_CHAR,firstPoolGlobalRank,15,CXios::globalComm) ;
+          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
-        else
+        if (rankGlobal == firstPoolGlobalRank)
         {
           MPI_Status status;
           char* recvBuff;
 
-          CRegistry globalRegistrySndServers (CServer::intraComm);
           globalRegistrySndServers.mergeRegistry(*globalRegistry) ;