Changeset 491 for XIOS/trunk/src/client.cpp

Timestamp:

09/26/14 14:52:09 (10 years ago)

Author:

mhnguyen

Message:

Removing using_server from iodef.xml file. From now on, XIOS is capable of dectectin automatically server mode

+) Check whether server is in the MPI global group
+) Add some more methods to set/unset using_server
+) Do some cleaning stuff

Test
+) On Curie
+) All test passed correctly without using_server id

File:

• XIOS/trunk/src/client.cpp (modified) (3 diffs)

XIOS/trunk/src/client.cpp

@@ -73 +73 @@
           }
 
+          // Verify whether we are on server mode or not
+          CXios::setNotUsingServer();
+          for (i=0; i < size; ++i)
+          {
+            if (hashServer == hashAll[i])
+            {
+              CXios::setUsingServer();
+              break;
+            }
+          }
+
           myColor=colors[hashClient] ;
 
@@ -116 +127 @@
         CTimer::get("XIOS init").resume() ;
 
+          // Verify whether we are on server mode or not
+        CXios::setNotUsingServer();
+        int interCommSize = 0, intraCommSize = 0;
+        oasis_get_intercomm(interComm,CXios::xiosCodeId);
+        MPI_Comm_size(interComm, &interCommSize);
+        MPI_Comm_size(intraComm, &intraCommSize);
+        if (interCommSize == intraCommSize) CXios::setUsingServer();
+
         if (CXios::usingServer)
         {
           MPI_Status status ;
-            MPI_Comm_rank(intraComm,&rank) ;
+          MPI_Comm_rank(intraComm,&rank) ;
           oasis_get_intercomm(interComm,CXios::xiosCodeId) ;
           if (rank==0) MPI_Recv(&serverLeader,1, MPI_INT, 0, 0, interComm, &status) ;
@@ -224 +243 @@
        std::filebuf* fb = m_infoStream.rdbuf();
        StdStringStream fileNameClient;
-       fileNameClient << fileName <<"_client_" << getRank() << ".txt";
+       fileNameClient << fileName <<"_client_" << getRank() << ".out";
        fb->open(fileNameClient.str().c_str(), std::ios::out);
        if (!fb->is_open())