...

[phys/latlib.git] / writeout.cpp

diff --git a/writeout.cpp b/writeout.cpp
index 2290a941cb343b72a0c4afe224903b33a51dbf55..5a68fec8845273b4d3ab806e62263a97c3cc9197 100644 (file)
--- a/writeout.cpp
+++ b/writeout.cpp
@@ -24,21 +24,47 @@ string writeout::tstamp(const long& timestamp)
 writeout::writeout(const string& wdir, const string& signature, 
                   const int& rank, const int& procs, const long& timestamp)
 {
+  struct stat sb;
+
   if(wdir != ""){
     numprocs = procs;
     sprintf(cRank, "%d", rank);
     fulldir = wdir + "/" + tstamp(timestamp) + "_" + signature + ".tmp";
-    mkdir( fulldir.c_str(),  0775);
+
+    mkdir( fulldir.c_str(), 0775);
 
     if(rank>0) of.open( (fulldir + "/rank" + cRank + ".tmp").c_str() );
     else of.open( (fulldir + "/" + signature + ".dat").c_str() );
 
+    logf.open( (fulldir + "/rank" + cRank + ".log").c_str() );
+
+    if ( (!of.is_open()) || (!logf.is_open()) ) {
+      cerr << "WRITEOUT: Could not open output- and/or log-file!" << endl << flush;
+      exit(1);
+    }
+
+    logf << "[ " << timestring() << " ] Log starts here." << endl;
+    
     buf = of.rdbuf();
+    logbuf = logf.rdbuf();
+
+    cout << buf << endl;
   }
   else{
     buf = cout.rdbuf();
+    logbuf = cerr.rdbuf();
   }
   out = new ostream(buf);
+  log = new ostream(logbuf);
+}
+
+string writeout::timestring()
+{
+  time_t rawtime;
+  string timestring;
+  time( &rawtime );
+  timestring = asctime( localtime( &rawtime ) );
+  return timestring.substr(0, timestring.size()-1);;
 }
 
 writeout::~writeout()
@@ -54,7 +80,7 @@ writeout::~writeout()
              if( (nextfile=getdatfile()) == "" ) sleep(1);
              else
                {
-                 cerr << "collecting " << nextfile << endl;
+                 logf << "collecting " << nextfile << endl;
 
                  ifstream myfile( (fulldir + "/" + nextfile).c_str() );
                  while(true){
@@ -79,6 +105,8 @@ writeout::~writeout()
                 (fulldir + "/rank" + cRank + ".part").c_str());
        }
     }
+  logf << "[ " << timestring() << " ] Log ends here." << endl;
+  logf.close();
 }
 
 string writeout::getdatfile()
@@ -88,7 +116,7 @@ string writeout::getdatfile()
   struct dirent *dirp;
 
   if((dp  = opendir(fulldir.c_str())) == NULL) {
-    cerr << "Error(" << errno << ") opening " << fulldir << endl;
+    logf << "Error(" << errno << ") opening " << fulldir << endl;
     return "";
   }