Changeset 491

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

Location:

XIOS/trunk

Files:

• inputs/COMPLETE/iodef.xml (modified) (2 diffs)
• src/client.cpp (modified) (3 diffs)
• src/cxios.cpp (modified) (6 diffs)
• src/cxios.hpp (modified) (2 diffs)
• src/server.cpp (modified) (1 diff)

XIOS/trunk/inputs/COMPLETE/iodef.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
-<simulation> 
+<simulation>
 
   <context id="atmosphere" src="./context_atmosphere.xml"/>
@@ -10 +10 @@
         <variable_group id="buffer">
             buffer_size = 80000000
-            buffer_server_factor_size = 2 
+            buffer_server_factor_size = 2
          </variable_group>
 
         <variable_group id="parameters" >
-          <variable id="using_server" type="boolean">false</variable>
           <variable id="info_level" type="int">100</variable>
-          <variable id="info_output_file" type="boolean">true</variable>
+          <variable id="print_file" type="boolean">true</variable>
         </variable_group>
       </variable_definition>

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())

XIOS/trunk/src/cxios.cpp

@@ -21 +21 @@
   MPI_Comm CXios::globalComm ;
   bool CXios::usingOasis ;
-  bool CXios::usingServer ;
+  bool CXios::usingServer = false;
   size_t CXios::bufferSize ;
   double CXios::bufferServerFactorSize=2 ;
@@ -33 +33 @@
     set_new_handler(noMemory);
     parseFile(rootFile);
-    usingServer=getin<bool>("using_server",false) ;
     usingOasis=getin<bool>("using_oasis",false) ;
     info.setLevel(getin<int>("info_level",0)) ;
-    printInfo2File=getin<bool>("info_output_file",false);
+    printInfo2File=getin<bool>("print_file",false);
     bufferSize=getin<size_t>("buffer_size",defaultBufferSize) ;
     bufferServerFactorSize=getin<double>("buffer_server_factor_size",defaultBufferServerFactorSize) ;
@@ -49 +48 @@
 
     isClient=true;
+
+    CClient::initialize(codeId,localComm,returnComm) ;
+
     if (usingServer) isServer=false;
     else isServer=true ;
-
-    CClient::initialize(codeId,localComm,returnComm) ;
 
     if (printInfo2File)
@@ -76 +76 @@
     initialize();
 
-    if (!usingServer) ERROR("void CXios::initServerSide(void)",<<"using_server is set to <false> and server initialization is called") ;
+//    if (!usingServer) ERROR("void CXios::initServerSide(void)",<<"using_server is set to <false> and server initialization is called") ;
     isClient=true;
     isServer=false ;
 
-    //! Initialize all aspect MPI
+    // Initialize all aspects MPI
     CServer::initialize();
 
@@ -88 +88 @@
       CServer::openInfoStream();
 
-    //! Enter the loop to listen message from Client
+    // Enter the loop to listen message from Client
     CServer::eventLoop();
 
-    //! Finalize
+    // Finalize
     CServer::finalize();
     CServer::closeInfoStream();
@@ -100 +100 @@
     xml::CXMLParser::ParseFile(filename);
   }
+
+  void CXios::setUsingServer()
+  {
+    usingServer = true;
+  }
+
+  void CXios::setNotUsingServer()
+  {
+    usingServer = false;
+  }
 }

XIOS/trunk/src/cxios.hpp

@@ -29 +29 @@
      static T getin(const string& id) ;
 
-//     static void openFileInfo(const StdString& fileName);
-//     static void closeFileInfo();
-
      static bool isClient ;
      static bool isServer ;
@@ -45 +42 @@
      static double defaultBufferServerFactorSize ;
 
-     private:
-//     static StdOFStream infoFileStream_;
+     public:
+      //! Setting xios to use server mode
+      static void setUsingServer();
+
+      //! Setting xios NOT to use server mode
+      static void setNotUsingServer();
 
   } ;

XIOS/trunk/src/server.cpp

@@ -405 +405 @@
        std::filebuf* fb = m_infoStream.rdbuf();
        StdStringStream fileNameServer;
-       fileNameServer << fileName <<"_server_"<<getRank() << ".txt";
+       fileNameServer << fileName <<"_server_"<<getRank() << ".out";
        fb->open(fileNameServer.str().c_str(), std::ios::out);
        if (!fb->is_open())