Merge branch 'master' of treefish.org:~/src/latlib

[phys/latlib.git] / writeout.cpp

diff --git a/writeout.cpp b/writeout.cpp
index eb14309e53c93959e53e4dc4668336af9681c339..2290a941cb343b72a0c4afe224903b33a51dbf55 100644 (file)
--- a/writeout.cpp
+++ b/writeout.cpp
@@ -9,23 +9,25 @@
 #include <sstream>
 #include <dirent.h>
 #include <errno.h>
 #include <sstream>
 #include <dirent.h>
 #include <errno.h>

+#include <unistd.h>

 
 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 + ".tmp";

     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() );


@@ -68,6 +70,7 @@ writeout::~writeout()
            }
          of << "#end" << endl << flush;
          of.close();
            }
          of << "#end" << endl << flush;
          of.close();

+         rename( fulldir.c_str(), fulldir.substr(0, fulldir.length()-4).c_str() );

        }
       else
        {
        }
       else
        {