Merge pull request #96 from pynbody/lustre-performance

Neaten behaviour of progress bar

README.md

@@ -7,8 +7,8 @@ GenetIC is a code to generate initial conditions for cosmological simulations, e
 * The main code is written in C++ and can be found (with build instructions and a test suite) in the subfolder `genetIC`. 
 * The code is also available as [docker](http://docker.io) image `apontzen/genetic` (see the user manual for further information)
 * A set of python tools for development and testing is provided in `tools`.
-* If you wish to use the code for science, we recommend adopting a particular version. The current release is v1.3 and can be downloaded at https://github.com/pynbody/genetIC/releases/tag/v1.3
-* Documentation can be found in the form of a PDF user manual, also at https://github.com/pynbody/genetIC/releases/tag/v1.3
+* If you wish to use the code for science, we recommend adopting a particular (numbered) version. The most recent release can be downloaded at https://github.com/pynbody/genetIC/releases/latest
+* Documentation can be found in the form of a PDF user manual, also at https://github.com/pynbody/genetIC/releases/latest
 * The technical underpinnings of the code are described in a release paper at https://arxiv.org/abs/2006.01841
 
 License and acknowledgement policy

genetIC/src/main.cpp

@@ -171,7 +171,7 @@ void setup_parser(tools::ClassDispatch<ICf, void> &dispatch) {
 }
 
 void header(ostream &outf, std::string prefix="") {
-  outf << prefix << "genetIC v1.3.0, compiled: " << __DATE__ << ", " << __TIME__ << endl;
+  outf << prefix << "genetIC v1.3.1, compiled: " << __DATE__ << ", " << __TIME__ << endl;
   time_t now = time(0);
   struct tm tstruct;
   char buf[80];

genetIC/src/tools/progress/progress.cpp

@@ -3,6 +3,7 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
+#include "src/tools/logging.hpp"
 #include "progress.hpp"
 
 namespace tools {
@@ -17,7 +18,7 @@ namespace tools {
         return size_t(size.ws_col);
     }
 
-    //! Returns true if the terminal display is wider than 0
+    //! Returns true if stdout is believed to be a terminal display
     bool ProgressBar::isInteractive() {
       return terminalWidth() > 0;
     }
@@ -42,7 +43,7 @@ namespace tools {
       stream << "\r";
     }
 
-    //! Update the display if possible
+    //! Update the display if stdout is a terminal
     void ProgressBar::update() {
       if (!isInteractive())
         return;
@@ -94,7 +95,8 @@ namespace tools {
         update();
       }
       update();
-      stream << std::endl;
+      if(isInteractive())
+        stream << std::endl;
     }
 
 
@@ -104,6 +106,8 @@ namespace tools {
       terminated = true;
       cv.notify_all();
       thread.join();
+      if(!isInteractive() && !title.empty())
+        logging::entry() << "Finished " << title << std::endl;
     }
 
     //! Updates the progress variable
@@ -122,6 +126,8 @@ namespace tools {
       nOpsCurrent = 0;
       terminated = false;
       thread = std::thread([this]() { this->runUpdateLoop(); });
+      if(!isInteractive() && !title.empty())
+        logging::entry() << "Starting " << title << std::endl;
     }
 
     //! Destructor - terminates progress bar if still in progress.