Changeset 497 for XIOS

Timestamp:

10/09/14 12:28:25 (10 years ago)

Author:

mhnguyen

Message:

Making a minor change of info output

+) Use a more beautiful format for name of info output file
+) Do a same thing to error file

Test
+) On curie
+) Passed

Location:

XIOS/trunk/src

Files:

• client.cpp (modified) (1 diff)
• cxios.cpp (modified) (2 diffs)
• cxios.hpp (modified) (1 diff)
• exception.cpp (modified) (2 diffs)
• log.hpp (modified) (1 diff)
• server.cpp (modified) (1 diff)

XIOS/trunk/src/client.cpp

@@ -249 +249 @@
        std::filebuf* fb = m_infoStream.rdbuf();
        StdStringStream fileNameClient;
-       fileNameClient << fileName <<"_client_" << getRank() << ".out";
+       int numDigit = 0;
+       int size = 0;
+       MPI_Comm_size(CXios::globalComm, &size);
+       while (size)
+       {
+         size /= 10;
+         ++numDigit;
+       }
+
+       fileNameClient << fileName <<"_client_" << std::setfill('0') << std::setw(numDigit) << getRank() << ".out";
        fb->open(fileNameClient.str().c_str(), std::ios::out);
        if (!fb->is_open())

XIOS/trunk/src/cxios.cpp

@@ -16 +16 @@
   string CXios::xiosCodeId="xios.x" ;
   string CXios::infoFile="./info_output";
+  string CXios::errorFile="./error_output";
 
   bool CXios::isClient ;
@@ -75 +76 @@
   {
     initialize();
-
-//    if (!usingServer) ERROR("void CXios::initServerSide(void)",<<"using_server is set to <false> and server initialization is called") ;
     isClient=true;
     isServer=false ;

XIOS/trunk/src/cxios.hpp

@@ -14 +14 @@
      static string xiosCodeId ;
      static string infoFile;
+     static string errorFile;
 
      static void initialize(void) ;

XIOS/trunk/src/exception.cpp

@@ -3 +3 @@
 /// boost headers ///
 #include <boost/cast.hpp>
+#include "client.hpp"
+#include "server.hpp"
+#include "cxios.hpp"
 
 namespace xios
@@ -23 +26 @@
 
    CException::~CException(void)
-   { 
+   {
       if (desc_rethrow)
 #ifdef __XIOS_NOABORT
-        throw (*this); 
+      {
+        throw (*this);
+      }
 #else
+     {
+      StdOFStream fileStream;
+      StdStringStream fileNameErr;
+      std::streambuf* psbuf;
+      if (CXios::isClient) fileNameErr<< CXios::errorFile <<"_client_" << CClient::getRank() << ".err";
+      else fileNameErr<< CXios::errorFile <<"_server_" << CServer::getRank() << ".err";
+
+      fileStream.open(fileNameErr.str().c_str(), std::ofstream::out);
+      psbuf = fileStream.rdbuf();
+      std::cerr.rdbuf(psbuf);
       std::cerr << this->getMessage() << std::endl;
+      fileStream.close();
       abort();
+      }
+
 #endif
    }

XIOS/trunk/src/log.hpp

@@ -18 +18 @@
       if (l<=level)
       {
-//        rdbuf(cout.rdbuf()) ;
         rdbuf(strBuf_);
         *this<<"-> "<<name<<" : " ;

XIOS/trunk/src/server.cpp

@@ -416 +416 @@
        std::filebuf* fb = m_infoStream.rdbuf();
        StdStringStream fileNameServer;
-       fileNameServer << fileName <<"_server_"<<getRank() << ".out";
+       int numDigit = 0;
+       int size = 0;
+       MPI_Comm_size(CXios::globalComm, &size);
+       while (size)
+       {
+         size /= 10;
+         ++numDigit;
+       }
+
+       fileNameServer << fileName <<"_server_" << std::setfill('0') << std::setw(numDigit) << getRank() << ".out";
        fb->open(fileNameServer.str().c_str(), std::ios::out);
        if (!fb->is_open())