Changeset 490 for XIOS/trunk/src/cxios.cpp

Timestamp:

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

Author:

mhnguyen

Message:

Implementing print output in seperate files

+) Add an option to write information into standard output or into files,
each of which is created by a process
+) Add a new file for global data (constant, value macro, etc)
+) Do a minor change in how to generate doxygen

Test
+) On Curie, with two modes: only client (connected) and client-server
+) All tests passed, each client prints out its info in a seperate file

File:

• XIOS/trunk/src/cxios.cpp (modified) (4 diffs)

XIOS/trunk/src/cxios.cpp

@@ -15 +15 @@
   string CXios::rootFile="./iodef.xml" ;
   string CXios::xiosCodeId="xios.x" ;
-  
+  string CXios::infoFile="./info_output";
+
   bool CXios::isClient ;
   bool CXios::isServer ;
   MPI_Comm CXios::globalComm ;
   bool CXios::usingOasis ;
-  bool CXios::usingServer ;   
+  bool CXios::usingServer ;
   size_t CXios::bufferSize ;
   double CXios::bufferServerFactorSize=2 ;
   size_t CXios::defaultBufferSize=1024*1024*100 ; // 100Mo
   double CXios::defaultBufferServerFactorSize=2 ;
-  
+  bool CXios::printInfo2File;
+
+
   void CXios::initialize()
   {
@@ -33 +36 @@
     usingOasis=getin<bool>("using_oasis",false) ;
     info.setLevel(getin<int>("info_level",0)) ;
+    printInfo2File=getin<bool>("info_output_file",false);
     bufferSize=getin<size_t>("buffer_size",defaultBufferSize) ;
     bufferServerFactorSize=getin<double>("buffer_server_factor_size",defaultBufferServerFactorSize) ;
@@ -41 +45 @@
   void CXios::initClientSide(const string& codeId, MPI_Comm& localComm, MPI_Comm& returnComm)
   {
-     
+
     initialize() ;
-    
+
     isClient=true;
     if (usingServer) isServer=false;
     else isServer=true ;
-    
+
     CClient::initialize(codeId,localComm,returnComm) ;
 
-  }   
+    if (printInfo2File)
+      CClient::openInfoStream(infoFile);
+    else
+      CClient::openInfoStream();
+  }
 
   void CXios::clientFinalize(void)
   {
-     CClient::finalize() ; 
+     CClient::finalize() ;
+     CClient::closeInfoStream();
+
 #ifdef XIOS_MEMTRACK
      MemTrack::TrackListMemoryUsage() ;
-     MemTrack::TrackDumpBlocks();  
+     MemTrack::TrackDumpBlocks();
 #endif
-  }   
-  
-  
+  }
+
+
   void CXios::initServerSide(void)
   {
@@ -70 +80 @@
     isServer=false ;
 
-    CServer::initialize() ;
-  } 
-  
+    //! Initialize all aspect MPI
+    CServer::initialize();
+
+    if (printInfo2File)
+      CServer::openInfoStream(infoFile);
+    else
+      CServer::openInfoStream();
+
+    //! Enter the loop to listen message from Client
+    CServer::eventLoop();
+
+    //! Finalize
+    CServer::finalize();
+    CServer::closeInfoStream();
+  }
+
   void CXios::parseFile(const string& filename)
   {
-    xml::CXMLParser::ParseFile(filename); 
+    xml::CXMLParser::ParseFile(filename);
   }
-  
-
 }