Changeset 1519 for XIOS/dev/XIOS_DEV_CMIP6/src/server.cpp

Timestamp:

06/04/18 10:43:19 (6 years ago)

Author:

oabramkina

Message:

Activating an option for setting different number of processes per secondary-server pool via parameter number_pools_server2.

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/server.cpp (modified) (3 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/server.cpp

@@ -38 +38 @@
  * \fn void CServer::initialize(void)
  * Creates intraComm for each possible type of servers (classical, primary or secondary).
- * (For now the assumption is that there is one proc per secondary server pool.)
  * Creates interComm and stores them into the following lists:
  *   classical server -- interCommLeft
@@ -110 +109 @@
           else
           {
+            if (CXios::nbPoolsServer2 == 0) CXios::nbPoolsServer2 = reqNbProc;
             int firstSndSrvRank = srvRanks.size()*(100.-CXios::ratioServer2)/100. ;
             int poolLeader = firstSndSrvRank;
 //*********** (1) Comment out the line below to set one process per pool
-//            sndServerGlobalRanks.push_back(srvRanks[poolLeader]);
+            sndServerGlobalRanks.push_back(srvRanks[poolLeader]);
             int nbPools = CXios::nbPoolsServer2;
             if ( nbPools > reqNbProc || nbPools < 1)
@@ -139 +139 @@
                 }
 //*********** (2) Comment out the two lines below to set one process per pool
-//                if (poolLeader < srvRanks.size())
-//                  sndServerGlobalRanks.push_back(srvRanks[poolLeader]);
+                if (poolLeader < srvRanks.size())
+                  sndServerGlobalRanks.push_back(srvRanks[poolLeader]);
 //*********** (3) Uncomment the line below to set one process per pool
-                sndServerGlobalRanks.push_back(srvRanks[i]);
+//                sndServerGlobalRanks.push_back(srvRanks[i]);
               }
               else