Changeset 1168 for XIOS/dev/dev_olga/src/server.cpp

Timestamp:

06/14/17 15:24:43 (7 years ago)

Author:

oabramkina

Message:

Two server levels: merging registries of secondary server pools into one and then writing the merged one.

Tested on curie with toy_cmip6.

File:

• XIOS/dev/dev_olga/src/server.cpp (modified) (5 diffs)

XIOS/dev/dev_olga/src/server.cpp

@@ -84 +84 @@
         map<unsigned long, int>::iterator it ;
 
-        int nbSrv = 0;
         int srvNodeSize = 1, srvNodeLeader = 0;
 
@@ -134 +133 @@
         {
           MPI_Allgather(&serverLevel, 1, MPI_LONG, hashAll, 1, MPI_LONG, CXios::globalComm) ;
+
           for (i=0; i<size; i++)
             if (hashAll[i] == 2)
@@ -188 +188 @@
             interCommRight.push_back(newComm) ;
           }
-        } // primary server
+        }
         else
         {
@@ -201 +201 @@
           MPI_Intercomm_create(intraComm, 0, CXios::globalComm, clientLeader, 1, &newComm) ;
           interCommLeft.push_back(newComm) ;
-        } // secondary server
+        }
 
         delete [] hashAll ;
@@ -667 +667 @@
      }
 
+     vector<int>& CServer::getSecondaryServerGlobalRanks()
+     {
+       return sndServerGlobalRanks;
+     }
+
     /*!
     * Open a file specified by a suffix and an extension and use it for the given file buffer.