...

[phys/latlib.git] / writeout.cpp

diff --git a/writeout.cpp b/writeout.cpp
index 4fb68e12a64f5b0a795be0ad86c82037d05533ac..73adfa684ddd79eda8191cc1b448c74220ccdce2 100644 (file)
--- a/writeout.cpp
+++ b/writeout.cpp
@@ -12,20 +12,21 @@
 
 using namespace std;
 
 
 using namespace std;
 

-string writeout::tstamp()
+string writeout::tstamp(const long& timestamp)

 {
 {

-    stringstream sstr;
-    sstr << time (NULL);
-    return sstr.str();
+  stringstream sstr;
+  if(!timestamp) sstr << time (NULL);
+  else sstr << timestamp;
+  return sstr.str();

 }
 
 writeout::writeout(const string& wdir, const string& signature, 
 }
 
 writeout::writeout(const string& wdir, const string& signature, 

-                  const int& rank, const int& procs)
+                  const int& rank, const int& procs, const long& timestamp)

 {
   if(wdir != ""){
     numprocs = procs;
     sprintf(cRank, "%d", rank);
 {
   if(wdir != ""){
     numprocs = procs;
     sprintf(cRank, "%d", rank);

-    fulldir = wdir + "/" + tstamp() + "_" + signature;
+    fulldir = wdir + "/" + tstamp(timestamp) + "_" + signature;

     mkdir( fulldir.c_str(),  0775);
 
     if(rank>0) of.open( (fulldir + "/rank" + cRank + ".tmp").c_str() );
     mkdir( fulldir.c_str(),  0775);
 
     if(rank>0) of.open( (fulldir + "/rank" + cRank + ".tmp").c_str() );


@@ -55,14 +56,13 @@ writeout::~writeout()
                  cerr << "collecting " << nextfile << endl;
 
                  ifstream myfile( (fulldir + "/" + nextfile).c_str() );
                  cerr << "collecting " << nextfile << endl;
 
                  ifstream myfile( (fulldir + "/" + nextfile).c_str() );

-                 while(myfile.good()){
+                 while(true){

                    string line;
                    getline(myfile, line);
                    string line;
                    getline(myfile, line);

-                   of << line << flush;
+                   if( !myfile.good() ) break;
+                   of << line << endl << flush;

                  }
                  myfile.close();
                  }
                  myfile.close();

-                 of << endl << flush;
-

                  remove( (fulldir + "/" + nextfile).c_str() );
                  jobsdone++;
                }
                  remove( (fulldir + "/" + nextfile).c_str() );
                  jobsdone++;
                }