...

[phys/latlib.git] / writeout.cpp

diff --git a/writeout.cpp b/writeout.cpp
index 54b82038d2bbe491e4dfbcbd3dc9e99a0b07473c..3849ac9bab479c02fc944dd32be082ca848f25e0 100644 (file)
--- a/writeout.cpp
+++ b/writeout.cpp
@@ -28,22 +28,29 @@ writeout::writeout(const string& wdir, const string& signature,
     numprocs = procs;
     sprintf(cRank, "%d", rank);
     fulldir = wdir + "/" + tstamp(timestamp) + "_" + signature + ".tmp";
     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(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();
     logf << "[ " << timestring() << " ] Log starts here." << endl;
     
     buf = of.rdbuf();
     logbuf = logf.rdbuf();

+
+    cout << buf << endl;

   }
   else{
     buf = cout.rdbuf();
   }
   else{
     buf = cout.rdbuf();

-    logf.open("/dev/null");
-    logbuf = logf.rdbuf();
+    logbuf = cerr.rdbuf();

   }
   out = new ostream(buf);
   log = new ostream(logbuf);
   }
   out = new ostream(buf);
   log = new ostream(logbuf);


@@ -71,7 +78,7 @@ writeout::~writeout()
              if( (nextfile=getdatfile()) == "" ) sleep(1);
              else
                {
              if( (nextfile=getdatfile()) == "" ) sleep(1);
              else
                {

-                 cerr << "collecting " << nextfile << endl;
+                 logf << "collecting " << nextfile << endl;

 
                  ifstream myfile( (fulldir + "/" + nextfile).c_str() );
                  while(true){
 
                  ifstream myfile( (fulldir + "/" + nextfile).c_str() );
                  while(true){


@@ -107,7 +114,7 @@ string writeout::getdatfile()
   struct dirent *dirp;
 
   if((dp  = opendir(fulldir.c_str())) == NULL) {
   struct dirent *dirp;
 
   if((dp  = opendir(fulldir.c_str())) == NULL) {

-    cerr << "Error(" << errno << ") opening " << fulldir << endl;
+    logf << "Error(" << errno << ") opening " << fulldir << endl;

     return "";
   }
   
     return "";
   }