From 7afa4755116f041a37c52ecdeb716a64033fdd1f Mon Sep 17 00:00:00 2001 From: Darth Vader Date: Tue, 7 Jan 2025 19:59:19 +0000 Subject: [PATCH] Squashed 'phreeqcpp/' changes from b948e30..c81916a c81916a Fixed examples to have fewer warnings. Fixed headers of some database files. Changed some output from warnings to comments. git-subtree-dir: phreeqcpp git-subtree-split: c81916ad120db26b431bae629b25e64447b72c75 --- mainsubs.cpp | 12 +++++++++--- transport.cpp | 18 +++++++++++------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/mainsubs.cpp b/mainsubs.cpp index ba317af0..11ee782d 100644 --- a/mainsubs.cpp +++ b/mainsubs.cpp @@ -681,9 +681,15 @@ initial_gas_phases(int print) if (pr.user_print) print_user_print(); if (PR /*&& use.Get_gas_phase_ptr()->total_p > 1.0*/) - warning_msg("While initializing gas phase composition by equilibrating:\n" - " Found definitions of gas` critical temperature and pressure.\n" - " Going to use Peng-Robinson in subsequent calculations.\n"); + { + std::ostringstream msg; + msg << "\nWhile initializing gas phase composition by equilibrating:\n"; + msg << " Found definitions of gas critical temperature and pressure.\n"; + msg << " Going to use Peng-Robinson in subsequent calculations.\n"; + screen_msg(msg.str().c_str()); + output_msg(msg.str().c_str()); + log_msg(msg.str().c_str()); + } xgas_save(n_user); punch_all(); /* free_model_allocs(); */ diff --git a/transport.cpp b/transport.cpp index 7bde99d4..f7ee9b4e 100644 --- a/transport.cpp +++ b/transport.cpp @@ -508,13 +508,17 @@ transport(void) /* * Now transport */ - if (implicit) - snprintf(token, sizeof(token), "\nCalculating implicit transport: %d (mobile) cells, %d shifts, %d mixruns, max. mixf = %g.\n\n", - count_cells, count_shifts - transport_start + 1, nmix, max_mixf); - else - snprintf(token, sizeof(token), "\nCalculating transport: %d (mobile) cells, %d shifts, %d mixruns...\n\n", - count_cells, count_shifts - transport_start + 1, nmix); - warning_msg(token); + { + if (implicit) + snprintf(token, sizeof(token), "\nCalculating implicit transport: %d (mobile) cells, %d shifts, %d mixruns, max. mixf = %g.\n\n", + count_cells, count_shifts - transport_start + 1, nmix, max_mixf); + else + snprintf(token, sizeof(token), "\nCalculating transport: %d (mobile) cells, %d shifts, %d mixruns...\n\n", + count_cells, count_shifts - transport_start + 1, nmix); + screen_msg(token); + output_msg(token); + log_msg(token); + } max_iter = 0; for (transport_step = transport_start; transport_step <= count_shifts; transport_step++)