max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 08:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '35f13a0f66449dd0d7f01732a52d2c2078728e2a'

Browse Source
This commit is contained in:
Darth Vader 2025-01-07 19:59:58 +00:00
commit 13bd43d71f
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/phreeqcpp/mainsubs.cpp
View File

@ -681,9 +681,15 @@ initial_gas_phases(int print)
if (pr.user_print) if (pr.user_print)
print_user_print(); print_user_print();
if (PR /*&& use.Get_gas_phase_ptr()->total_p > 1.0*/) 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" std::ostringstream msg;
" Going to use Peng-Robinson in subsequent calculations.\n"); 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); xgas_save(n_user);
punch_all(); punch_all();
/* free_model_allocs(); */ /* free_model_allocs(); */

6
src/phreeqcpp/transport.cpp
View File

@ -508,13 +508,17 @@ transport(void)
/* /*
* Now transport * Now transport
*/ */
{
if (implicit) if (implicit)
snprintf(token, sizeof(token), "\nCalculating implicit transport: %d (mobile) cells, %d shifts, %d mixruns, max. mixf = %g.\n\n", 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); count_cells, count_shifts - transport_start + 1, nmix, max_mixf);
else else
snprintf(token, sizeof(token), "\nCalculating transport: %d (mobile) cells, %d shifts, %d mixruns...\n\n", snprintf(token, sizeof(token), "\nCalculating transport: %d (mobile) cells, %d shifts, %d mixruns...\n\n",
count_cells, count_shifts - transport_start + 1, nmix); count_cells, count_shifts - transport_start + 1, nmix);
warning_msg(token); screen_msg(token);
output_msg(token);
log_msg(token);
}
max_iter = 0; max_iter = 0;
for (transport_step = transport_start; transport_step <= count_shifts; for (transport_step = transport_start; transport_step <= count_shifts;
transport_step++) transport_step++)