diff --git a/PHRQ_io_output.cpp b/PHRQ_io_output.cpp index 46f66896..5eaeb5c1 100644 --- a/PHRQ_io_output.cpp +++ b/PHRQ_io_output.cpp @@ -201,7 +201,9 @@ void Phreeqc:: screen_msg(const char *err_str) /* ---------------------------------------------------------------------- */ { +#ifndef TESTING if (phrq_io) phrq_io->screen_msg(err_str); +#endif } // ---------------------------------------------------------------------- */ // dump file methods diff --git a/class_main.cpp b/class_main.cpp index ee43e385..2730fc9d 100644 --- a/class_main.cpp +++ b/class_main.cpp @@ -283,6 +283,9 @@ int Phreeqc:: write_banner(void) /* ---------------------------------------------------------------------- */ { +#ifdef TESTING + return OK; +#endif char buffer[80]; int len, indent; screen_msg( diff --git a/transport.cpp b/transport.cpp index 00fedd8a..e0715df5 100644 --- a/transport.cpp +++ b/transport.cpp @@ -501,7 +501,7 @@ transport(void) else sprintf(token, "\nCalculating transport: %d (mobile) cells, %d shifts, %d mixruns...\n\n", count_cells, count_shifts - transport_start + 1, nmix); - screen_msg(token); + warning_msg(token); max_iter = 0; for (transport_step = transport_start; transport_step <= count_shifts; transport_step++) @@ -960,8 +960,7 @@ transport(void) { sprintf(token, "\nFor balancing negative concentrations in MCD, added in total to the system:"); - if (phrq_io) - phrq_io->warning_msg(token); + warning_msg(token); for (i = 0; i < count_moles_added; i++) { if (!moles_added[i].moles) @@ -969,8 +968,7 @@ transport(void) sprintf(token, "\t %.4e moles %s.", (double)moles_added[i].moles, moles_added[i].name); - if (phrq_io) - phrq_io->warning_msg(token); + warning_msg(token); } } }