Show progress bar also in fe-bubble calculation

Author: ttadano

anphon/thermodynamics.cpp

@@ -15,14 +15,13 @@
 #include "constants.h"
 #include "dynamical.h"
 #include "kpoint.h"
-#include "mathfunctions.h"
 #include "memory.h"
 #include "mpi_common.h"
 #include "phonon_dos.h"
 #include "pointers.h"
 #include "relaxation.h"
-#include "scph.h"
 #include "system.h"
+#include "progress_bar.h"
 
 using namespace PHON_NS;
 
@@ -559,6 +558,10 @@ void Thermodynamics::compute_FE_bubble_SCPH(double ***eval_in, std::complex<doub
         }
     }
 
+    auto startTime = std::chrono::system_clock::now();
+    auto lastUpdate = startTime;
+    bool isConsole = isOutputToConsole();
+
     unsigned int nk_tmp;
 
     if (nks0 % mympi->nprocs != 0) {
@@ -570,6 +573,9 @@ void Thermodynamics::compute_FE_bubble_SCPH(double ***eval_in, std::complex<doub
         vks_l.push_back(-1);
     }
 
+    auto nks_tmp = vks_l.size();
+
+
     for (iT = 0; iT < NT; ++iT)
         FE_local[iT] = 0.0;
 
@@ -654,6 +660,16 @@ void Thermodynamics::compute_FE_bubble_SCPH(double ***eval_in, std::complex<doub
             for (iT = 0; iT < NT; ++iT)
                 FE_local[iT] += FE_tmp[iT] * weight;
         }
+        if (mympi->my_rank == 0) {
+            auto currentTime = std::chrono::system_clock::now();
+            long long totalElapsedTime =
+                std::chrono::duration_cast<std::chrono::milliseconds>(currentTime - startTime).count();
+            long long avgTimePerStep = (i0 == 0) ? 0 : totalElapsedTime / i0;
+            long long timeRemaining = (i0 == 0) ? 0 : avgTimePerStep * (nks_tmp - i0 - 1);
+            displayProgressBar(i0, nks_tmp - 1, std::cout, timeRemaining, isConsole, "Fe-bubble");
+            lastUpdate = currentTime;
+            if (i0 == nk_tmp - 1) std::cout << "\n done. \n\n" << std::flush;
+        }
     }
 
     MPI_Allreduce(&FE_local[0], &FE_bubble[0], NT, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);

include/progress_bar.h

@@ -17,16 +17,16 @@
 #include <unistd.h> // POSIX header for isatty()
 #endif
 
-auto isOutputToConsole() -> bool
+inline auto isOutputToConsole() -> bool
 {
     // File descriptor 1 is stdout
     bool isConsoleOutput = getenv("FORCE_CONSOLE_OUTPUT") != nullptr;
     return isConsoleOutput;
     //return isConsoleOutput || isatty(fileno(stdout));
 }
 
-auto displayProgressBar(int current, int total, std::ostream& out, long long timeRemaining, bool isConsoleOutput,
-                        const std::string prefix = "3ph", const int width = 40) -> void
+inline auto displayProgressBar(int current, int total, std::ostream& out, long long timeRemaining, bool isConsoleOutput,
+                               const std::string prefix = "3ph", const int width = 40) -> void
 {
 
     float progress = (float)current / total;