fix progress bar bug

Author: dav-og

src/hydrochrono_runner/run_hydrochrono_from_yaml.cpp

@@ -23,6 +23,7 @@
 #include <sstream>
 #include <chrono>
 #include <iomanip>
+#include <cmath>
 
 #ifdef _WIN32
 #include <windows.h>
@@ -697,6 +698,14 @@ int RunHydroChronoFromYAML(int argc, char* argv[]) {
 
         if (nogui) {
             const double end_time_bound = (yaml_end_time > 0.0) ? yaml_end_time : 40.0;
+            // Estimate total steps for progress bar; ensure at least 1
+            const double remaining_time = std::max(0.0, end_time_bound - initial_time);
+            const size_t total_steps_est = static_cast<size_t>(std::max(1.0, std::ceil(remaining_time / std::max(1e-12, loop_dt))));
+            size_t last_progress_step = 0;
+
+            // Initial progress line
+            hydroc::cli::ShowProgress(0, total_steps_est, std::string("t=") + hydroc::FormatNumber(initial_time, 2) + " / " + hydroc::FormatNumber(end_time_bound, 2) + " s");
+
             while (system->GetChTime() < end_time_bound) {
                 double current_time = system->GetChTime();
                 try {
@@ -709,18 +718,33 @@ int RunHydroChronoFromYAML(int argc, char* argv[]) {
                         exporter->RecordStep(system.get());
                         if (profile_mode) { prof_export_seconds += std::chrono::duration_cast<std::chrono::duration<double>>(std::chrono::steady_clock::now() - t).count(); }
                     }
+                    // Update progress periodically to reduce console churn
+                    if (step_count == 1 || step_count - static_cast<int>(last_progress_step) >= 25) {
+                        const size_t current_steps = static_cast<size_t>(std::min<double>(total_steps_est, std::ceil((system->GetChTime() - initial_time) / std::max(1e-12, loop_dt))));
+                        std::string msg = std::string("t=") + hydroc::FormatNumber(system->GetChTime(), 2) + " / " + hydroc::FormatNumber(end_time_bound, 2) + " s";
+                        hydroc::cli::ShowProgress(current_steps, total_steps_est, msg);
+                        last_progress_step = static_cast<size_t>(step_count);
+                    }
                     previous_time = current_time;
                 } catch (const std::exception& e) {
+                    hydroc::cli::StopProgress();
                     hydroc::cli::LogError(std::string("🔥 Exception during DoStepDynamics at step ") + std::to_string(step_count) + ": " + e.what());
                     hydroc::cli::LogError(std::string("Simulation time: ") + hydroc::FormatNumber(current_time, 6) + " s");
                     hydroc::cli::LogError(std::string("Step size: ") + hydroc::FormatNumber(loop_dt, 6) + " s");
                     break;
                 } catch (...) {
+                    hydroc::cli::StopProgress();
                     hydroc::cli::LogError(std::string("🔥 Unknown exception during DoStepDynamics at step ") + std::to_string(step_count));
                     hydroc::cli::LogError(std::string("Simulation time: ") + hydroc::FormatNumber(current_time, 6) + " s");
                     break;
                 }
             }
+            // Finalize progress line
+            if (system->GetChTime() >= end_time_bound - 1e-9) {
+                hydroc::cli::ShowProgress(total_steps_est, total_steps_est, "Completed");
+            } else {
+                hydroc::cli::StopProgress();
+            }
         } else {
             // GUI-driven loop: respects pause via ui.simulationStarted and closes when window stops
             while (ui.IsRunning(loop_dt)) {

src/utils/logging.cpp

@@ -168,7 +168,6 @@ class CLILogger {
      */
     void StopProgress() noexcept {
         if (showing_progress_) {
-            LoggingWriteGuard guard;
             if (!progress_completed_) {
                 // Clear the in-place progress line only if not completed
                 std::cerr << "\r";
@@ -255,8 +254,7 @@ class CLILogger {
         const int percentage = static_cast<int>(progress * 100);
         std::string progress_text = bar + std::string(" ") + std::to_string(percentage) + "%";
         if (!message.empty()) progress_text += std::string(" - ") + message;
-        // Write in-place on the same console line using stderr, guarded to bypass interception
-        LoggingWriteGuard guard;
+        // Write in-place on the same console line using stderr; let interceptor handle quiet mode
         std::cerr << "\r" << progress_text;
         // Clear any remnants from a longer previous line
         int pad = std::max(0, progress_last_width_ - static_cast<int>(progress_text.size()));
@@ -460,6 +458,11 @@ namespace {
             // a newline (commonly used for in-place progress updates coming from
             // external libraries). We bypass the logger to preserve terminal state.
             if (buffer_.find('\r') != std::string::npos) {
+                // Respect quiet mode: suppress CLI output entirely when disabled
+                if (!g_initialized || !g_backend || !g_backend->GetConfig().enable_cli_output) {
+                    buffer_.clear();
+                    return;
+                }
                 if (original_) {
                     original_->sputn(buffer_.data(), static_cast<std::streamsize>(buffer_.size()));
                 }
@@ -469,16 +472,34 @@ namespace {
 
             // If line looks like our own logger output (e.g., starts with '[' or begins with ANSI then '['), pass through
             if (!buffer_.empty() && (buffer_[0] == '[' || (buffer_[0] == '\033' && buffer_.find("[") != std::string::npos))) {
+                // Respect quiet mode: suppress CLI output when disabled
+                if (!g_initialized || !g_backend || !g_backend->GetConfig().enable_cli_output) {
+                    buffer_.clear();
+                    return;
+                }
+                // Heuristic: if it looks like a progress bar (e.g., contains '%'), render in-place without newline
+                bool looks_like_progress = (buffer_.find('%') != std::string::npos);
                 if (original_) {
-                    original_->sputn(buffer_.data(), static_cast<std::streamsize>(buffer_.size()));
-                    original_->sputc('\n');
+                    if (looks_like_progress) {
+                        original_->sputc('\r');
+                        original_->sputn(buffer_.data(), static_cast<std::streamsize>(buffer_.size()));
+                        // Do not append newline; UpdateProgressDisplay will manage padding and final newline
+                    } else {
+                        original_->sputn(buffer_.data(), static_cast<std::streamsize>(buffer_.size()));
+                        original_->sputc('\n');
+                    }
                 }
                 buffer_.clear();
                 return;
             }
 
             // Route or suppress external prints
             if (kind_ == StreamKind::StdOut) {
+                // Respect quiet mode: suppress CLI output entirely when disabled
+                if (!g_initialized || !g_backend || !g_backend->GetConfig().enable_cli_output) {
+                    buffer_.clear();
+                    return;
+                }
                 if (StartsWith(buffer_, "File: ")) {
                     // Treat noisy OBJ path echoes as debug-only
                     hydroc::debug::LogDebug(buffer_);
@@ -492,6 +513,11 @@ namespace {
                     hydroc::cli::LogInfo(buffer_);
                 }
             } else { // StdErr
+                // Respect quiet mode: suppress CLI output entirely when disabled
+                if (!g_initialized || !g_backend || !g_backend->GetConfig().enable_cli_output) {
+                    buffer_.clear();
+                    return;
+                }
                 if (buffer_.find("Cannot open colormap data file") != std::string::npos) {
                     // Collect for Warnings section only; avoid inline duplication
                     hydroc::cli::CollectWarning(buffer_);