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

Merge remote-tracking branch 'scharlton2/master'

Browse Source
This commit is contained in:
David Parkhurst 2020-09-23 15:49:19 -06:00
commit 23f391743a
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
print.cpp
View File

@ -1479,10 +1479,11 @@ print_species(void)
{ {
output_msg(sformatf("%50s%10s%10s%10s\n", "Log", "Log", "Log", "mole V")); output_msg(sformatf("%50s%10s%10s%10s\n", "Log", "Log", "Log", "mole V"));
} }
output_msg(sformatf(" %-13s%12s%12s%10s%10s%10s%10s\n\n", "Species",
#ifdef NO_UTF8_ENCODING #ifdef NO_UTF8_ENCODING
output_msg(sformatf(" %-13s%12s%12s%10s%10s%10s%10s\n\n", "Species",
"Molality", "Activity", "Molality", "Activity", "Gamma", "cm3/mol")); "Molality", "Activity", "Molality", "Activity", "Gamma", "cm3/mol"));
#else #else
output_msg(sformatf(" %-13s%12s%12s%10s%10s%10s%11s\n\n", "Species",
"Molality", "Activity", "Molality", "Activity", "Gamma", "cm³/mol")); "Molality", "Activity", "Molality", "Activity", "Gamma", "cm³/mol"));
#endif #endif
/* /*
@ -2232,10 +2233,11 @@ print_totals(void)
if (SC > 0) if (SC > 0)
{ {
//output_msg(sformatf("%36s%i%7s%i\n", //output_msg(sformatf("%36s%i%7s%i\n",
output_msg(sformatf("%35s%3.0f%7s%i\n",
#ifdef NO_UTF8_ENCODING #ifdef NO_UTF8_ENCODING
output_msg(sformatf("%35s%3.0f%7s%i\n",
"Specific Conductance (uS/cm, ", tc_x, "oC) = ", (int) SC)); "Specific Conductance (uS/cm, ", tc_x, "oC) = ", (int) SC));
#else #else
output_msg(sformatf("%36s%3.0f%7s%i\n",
"Specific Conductance (µS/cm, ", tc_x, "°C) = ", (int) SC)); "Specific Conductance (µS/cm, ", tc_x, "°C) = ", (int) SC));
#endif #endif
} }
@ -2246,7 +2248,7 @@ print_totals(void)
#ifdef NO_UTF8_ENCODING #ifdef NO_UTF8_ENCODING
output_msg(sformatf("%45s%9.5f", "Density (g/cm3) = ", output_msg(sformatf("%45s%9.5f", "Density (g/cm3) = ",
#else #else
output_msg(sformatf("%45s%9.5f", "Density (g/cm³) = ", output_msg(sformatf("%46s%9.5f", "Density (g/cm³) = ",
#endif #endif
(double) dens)); (double) dens));
if (state == INITIAL_SOLUTION && use.Get_solution_ptr()->Get_initial_data()->Get_calc_density()) if (state == INITIAL_SOLUTION && use.Get_solution_ptr()->Get_initial_data()->Get_calc_density())
@ -2266,10 +2268,11 @@ print_totals(void)
(double) viscos)); (double) viscos));
if (tc_x > 200 && !pure_water) if (tc_x > 200 && !pure_water)
{ {
output_msg(sformatf("%18s\n",
#ifdef NO_UTF8_ENCODING #ifdef NO_UTF8_ENCODING
output_msg(sformatf("%18s\n",
" (solute contributions limited to 200 oC)")); " (solute contributions limited to 200 oC)"));
#else #else
output_msg(sformatf("%19s\n",
" (solute contributions limited to 200 °C)")); " (solute contributions limited to 200 °C)"));
#endif #endif
} }
@ -2300,7 +2303,7 @@ print_totals(void)
#ifdef NO_UTF8_ENCODING #ifdef NO_UTF8_ENCODING
output_msg(sformatf("%45s%6.2f\n", "Temperature (oC) = ", output_msg(sformatf("%45s%6.2f\n", "Temperature (oC) = ",
#else #else
output_msg(sformatf("%45s%6.2f\n", "Temperature (°C) = ", output_msg(sformatf("%46s%6.2f\n", "Temperature (°C) = ",
#endif #endif
(double) tc_x)); (double) tc_x));