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

cleaned up to eliminate some prints

Browse Source
This commit is contained in:
David Parkhurst 2021-08-05 15:34:57 -06:00
parent 07a864d1a6
commit 2a9464430b
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PHRQ_io_output.cpp
View File

@ -201,7 +201,9 @@ void Phreeqc::
screen_msg(const char *err_str) screen_msg(const char *err_str)
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
{ {
#ifndef TESTING
if (phrq_io) phrq_io->screen_msg(err_str); if (phrq_io) phrq_io->screen_msg(err_str);
#endif
} }
// ---------------------------------------------------------------------- */ // ---------------------------------------------------------------------- */
// dump file methods // dump file methods

3
class_main.cpp
View File

@ -283,6 +283,9 @@ int Phreeqc::
write_banner(void) write_banner(void)
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
{ {
#ifdef TESTING
return OK;
#endif
char buffer[80]; char buffer[80];
int len, indent; int len, indent;
screen_msg( screen_msg(

8
transport.cpp
View File

@ -501,7 +501,7 @@ transport(void)
else else
sprintf(token, "\nCalculating transport: %d (mobile) cells, %d shifts, %d mixruns...\n\n", sprintf(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);
screen_msg(token); warning_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++)
@ -960,8 +960,7 @@ transport(void)
{ {
sprintf(token, sprintf(token,
"\nFor balancing negative concentrations in MCD, added in total to the system:"); "\nFor balancing negative concentrations in MCD, added in total to the system:");
if (phrq_io) warning_msg(token);
phrq_io->warning_msg(token);
for (i = 0; i < count_moles_added; i++) for (i = 0; i < count_moles_added; i++)
{ {
if (!moles_added[i].moles) if (!moles_added[i].moles)
@ -969,8 +968,7 @@ transport(void)
sprintf(token, sprintf(token,
"\t %.4e moles %s.", "\t %.4e moles %s.",
(double)moles_added[i].moles, moles_added[i].name); (double)moles_added[i].moles, moles_added[i].name);
if (phrq_io) warning_msg(token);
phrq_io->warning_msg(token);
} }
} }
} }