Merge commit '0e67b4a4541435fa7c4f2c07a642c313d5e1ce1a'

This commit is contained in:
Darth Vader 2023-05-28 20:03:31 +00:00
commit a13fbe0134

View File

@ -2213,7 +2213,7 @@ print_totals(void)
output_msg(sformatf("%35s%3.0f%7s%i\n", 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("%35s%3.0f%7s%i\n", 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
} }
@ -2224,7 +2224,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())
@ -2279,7 +2279,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));