mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-15 16:18:22 +01:00
Merge commit '0e67b4a4541435fa7c4f2c07a642c313d5e1ce1a'
This commit is contained in:
commit
a13fbe0134
@ -2213,7 +2213,7 @@ print_totals(void)
|
||||
output_msg(sformatf("%35s%3.0f%7s%i\n",
|
||||
"Specific Conductance (uS/cm, ", tc_x, "oC) = ", (int) SC));
|
||||
#else
|
||||
output_msg(sformatf("%35s%3.0f%7s%i\n",
|
||||
output_msg(sformatf("%36s%3.0f%7s%i\n",
|
||||
"Specific Conductance (µS/cm, ", tc_x, "°C) = ", (int) SC));
|
||||
#endif
|
||||
}
|
||||
@ -2224,7 +2224,7 @@ print_totals(void)
|
||||
#ifdef NO_UTF8_ENCODING
|
||||
output_msg(sformatf("%45s%9.5f", "Density (g/cm3) = ",
|
||||
#else
|
||||
output_msg(sformatf("%45s%9.5f", "Density (g/cm³) = ",
|
||||
output_msg(sformatf("%46s%9.5f", "Density (g/cm³) = ",
|
||||
#endif
|
||||
(double) dens));
|
||||
if (state == INITIAL_SOLUTION && use.Get_solution_ptr()->Get_initial_data()->Get_calc_density())
|
||||
@ -2279,7 +2279,7 @@ print_totals(void)
|
||||
#ifdef NO_UTF8_ENCODING
|
||||
output_msg(sformatf("%45s%6.2f\n", "Temperature (oC) = ",
|
||||
#else
|
||||
output_msg(sformatf("%45s%6.2f\n", "Temperature (°C) = ",
|
||||
output_msg(sformatf("%46s%6.2f\n", "Temperature (°C) = ",
|
||||
#endif
|
||||
(double) tc_x));
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user