mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-16 08:38:23 +01:00
Merge commit 'ae41a1ffa67d7b4bf60373a164e24802cb7a1797'
This commit is contained in:
Darth Vader
commit
4750442170
@ -286,6 +286,7 @@ write_banner(void)
|
|||||||
#ifdef TESTING
|
#ifdef TESTING
|
||||||
return OK;
|
return OK;
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef NO_UTF8_ENCODING
|
||||||
char buffer[80];
|
char buffer[80];
|
||||||
int len, indent;
|
int len, indent;
|
||||||
screen_msg(
|
screen_msg(
|
||||||
@ -329,7 +330,7 @@ write_banner(void)
|
|||||||
|
|
||||||
screen_msg(
|
screen_msg(
|
||||||
" █▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄█\n\n");
|
" █▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄█\n\n");
|
||||||
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,3 +1,4 @@
|
|||||||
|
// -*- coding: windows-1252 -*-
|
||||||
#include "Utils.h"
|
#include "Utils.h"
|
||||||
#include "Phreeqc.h"
|
#include "Phreeqc.h"
|
||||||
#include "phqalloc.h"
|
#include "phqalloc.h"
|
||||||
@ -1457,7 +1458,7 @@ print_species(void)
|
|||||||
"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",
|
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
|
||||||
/*
|
/*
|
||||||
* Print list of species
|
* Print list of species
|
||||||
@ -1625,7 +1626,7 @@ print_surface(void)
|
|||||||
#ifdef NO_UTF8_ENCODING
|
#ifdef NO_UTF8_ENCODING
|
||||||
output_msg(sformatf("\t%11.3e sigma, C/m2\n",
|
output_msg(sformatf("\t%11.3e sigma, C/m2\n",
|
||||||
#else
|
#else
|
||||||
output_msg(sformatf("\t%11.3e sigma, C/m²\n",
|
output_msg(sformatf("\t%11.3e sigma, C/m²\n",
|
||||||
#endif
|
#endif
|
||||||
(double) (charge * F_C_MOL /
|
(double) (charge * F_C_MOL /
|
||||||
(charge_ptr->Get_specific_area() *
|
(charge_ptr->Get_specific_area() *
|
||||||
@ -1636,7 +1637,7 @@ print_surface(void)
|
|||||||
#ifdef NO_UTF8_ENCODING
|
#ifdef NO_UTF8_ENCODING
|
||||||
output_msg(sformatf("\tundefined sigma, C/m2\n"));
|
output_msg(sformatf("\tundefined sigma, C/m2\n"));
|
||||||
#else
|
#else
|
||||||
output_msg(sformatf("\tundefined sigma, C/m²\n"));
|
output_msg(sformatf("\tundefined sigma, C/m²\n"));
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
if (use.Get_surface_ptr()->Get_type() == cxxSurface::CCM)
|
if (use.Get_surface_ptr()->Get_type() == cxxSurface::CCM)
|
||||||
@ -1658,7 +1659,7 @@ print_surface(void)
|
|||||||
#ifdef NO_UTF8_ENCODING
|
#ifdef NO_UTF8_ENCODING
|
||||||
"\t%11.3e specific area, m2/mol %s\n",
|
"\t%11.3e specific area, m2/mol %s\n",
|
||||||
#else
|
#else
|
||||||
"\t%11.3e specific area, m²/mol %s\n",
|
"\t%11.3e specific area, m²/mol %s\n",
|
||||||
#endif
|
#endif
|
||||||
(double) charge_ptr->Get_specific_area(),
|
(double) charge_ptr->Get_specific_area(),
|
||||||
comp_ptr->Get_phase_name().c_str()));
|
comp_ptr->Get_phase_name().c_str()));
|
||||||
@ -1666,7 +1667,7 @@ print_surface(void)
|
|||||||
#ifdef NO_UTF8_ENCODING
|
#ifdef NO_UTF8_ENCODING
|
||||||
"\t%11.3e m2 for %11.3e moles of %s\n\n",
|
"\t%11.3e m2 for %11.3e moles of %s\n\n",
|
||||||
#else
|
#else
|
||||||
"\t%11.3e m² for %11.3e moles of %s\n\n",
|
"\t%11.3e m² for %11.3e moles of %s\n\n",
|
||||||
#endif
|
#endif
|
||||||
(double) (charge_ptr->Get_grams() *
|
(double) (charge_ptr->Get_grams() *
|
||||||
charge_ptr->Get_specific_area()),
|
charge_ptr->Get_specific_area()),
|
||||||
@ -1679,7 +1680,7 @@ print_surface(void)
|
|||||||
#ifdef NO_UTF8_ENCODING
|
#ifdef NO_UTF8_ENCODING
|
||||||
"\t%11.3e specific area, m2/mol %s\n",
|
"\t%11.3e specific area, m2/mol %s\n",
|
||||||
#else
|
#else
|
||||||
"\t%11.3e specific area, m²/mol %s\n",
|
"\t%11.3e specific area, m²/mol %s\n",
|
||||||
#endif
|
#endif
|
||||||
(double) charge_ptr->Get_specific_area(),
|
(double) charge_ptr->Get_specific_area(),
|
||||||
comp_ptr->Get_rate_name().c_str()));
|
comp_ptr->Get_rate_name().c_str()));
|
||||||
@ -1687,7 +1688,7 @@ print_surface(void)
|
|||||||
#ifdef NO_UTF8_ENCODING
|
#ifdef NO_UTF8_ENCODING
|
||||||
"\t%11.3e m2 for %11.3e moles of %s\n\n",
|
"\t%11.3e m2 for %11.3e moles of %s\n\n",
|
||||||
#else
|
#else
|
||||||
"\t%11.3e m² for %11.3e moles of %s\n\n",
|
"\t%11.3e m² for %11.3e moles of %s\n\n",
|
||||||
#endif
|
#endif
|
||||||
(double) (charge_ptr->Get_grams() *
|
(double) (charge_ptr->Get_grams() *
|
||||||
charge_ptr->Get_specific_area()),
|
charge_ptr->Get_specific_area()),
|
||||||
@ -1700,13 +1701,13 @@ print_surface(void)
|
|||||||
#ifdef NO_UTF8_ENCODING
|
#ifdef NO_UTF8_ENCODING
|
||||||
"\t%11.3e specific area, m2/g\n",
|
"\t%11.3e specific area, m2/g\n",
|
||||||
#else
|
#else
|
||||||
"\t%11.3e specific area, m²/g\n",
|
"\t%11.3e specific area, m²/g\n",
|
||||||
#endif
|
#endif
|
||||||
(double) charge_ptr->Get_specific_area()));
|
(double) charge_ptr->Get_specific_area()));
|
||||||
#ifdef NO_UTF8_ENCODING
|
#ifdef NO_UTF8_ENCODING
|
||||||
output_msg(sformatf("\t%11.3e m2 for %11.3e g\n\n",
|
output_msg(sformatf("\t%11.3e m2 for %11.3e g\n\n",
|
||||||
#else
|
#else
|
||||||
output_msg(sformatf("\t%11.3e m² for %11.3e g\n\n",
|
output_msg(sformatf("\t%11.3e m² for %11.3e g\n\n",
|
||||||
#endif
|
#endif
|
||||||
(double) (charge_ptr->Get_specific_area() *
|
(double) (charge_ptr->Get_specific_area() *
|
||||||
charge_ptr->Get_grams()),
|
charge_ptr->Get_grams()),
|
||||||
@ -1921,28 +1922,28 @@ print_surface_cd_music(void)
|
|||||||
#ifdef NO_UTF8_ENCODING
|
#ifdef NO_UTF8_ENCODING
|
||||||
"\t%11.3e sigma, plane 0, C/m2\n",
|
"\t%11.3e sigma, plane 0, C/m2\n",
|
||||||
#else
|
#else
|
||||||
"\t%11.3e sigma, plane 0, C/m²\n",
|
"\t%11.3e sigma, plane 0, C/m²\n",
|
||||||
#endif
|
#endif
|
||||||
(double) charge_ptr->Get_sigma0()));
|
(double) charge_ptr->Get_sigma0()));
|
||||||
output_msg(sformatf(
|
output_msg(sformatf(
|
||||||
#ifdef NO_UTF8_ENCODING
|
#ifdef NO_UTF8_ENCODING
|
||||||
"\t%11.3e sigma, plane 1, C/m2\n",
|
"\t%11.3e sigma, plane 1, C/m2\n",
|
||||||
#else
|
#else
|
||||||
"\t%11.3e sigma, plane 1, C/m²\n",
|
"\t%11.3e sigma, plane 1, C/m²\n",
|
||||||
#endif
|
#endif
|
||||||
(double) charge_ptr->Get_sigma1()));
|
(double) charge_ptr->Get_sigma1()));
|
||||||
output_msg(sformatf(
|
output_msg(sformatf(
|
||||||
#ifdef NO_UTF8_ENCODING
|
#ifdef NO_UTF8_ENCODING
|
||||||
"\t%11.3e sigma, plane 2, C/m2\n",
|
"\t%11.3e sigma, plane 2, C/m2\n",
|
||||||
#else
|
#else
|
||||||
"\t%11.3e sigma, plane 2, C/m²\n",
|
"\t%11.3e sigma, plane 2, C/m²\n",
|
||||||
#endif
|
#endif
|
||||||
(double) charge_ptr->Get_sigma2()));
|
(double) charge_ptr->Get_sigma2()));
|
||||||
output_msg(sformatf(
|
output_msg(sformatf(
|
||||||
#ifdef NO_UTF8_ENCODING
|
#ifdef NO_UTF8_ENCODING
|
||||||
"\t%11.3e sigma, diffuse layer, C/m2\n\n",
|
"\t%11.3e sigma, diffuse layer, C/m2\n\n",
|
||||||
#else
|
#else
|
||||||
"\t%11.3e sigma, diffuse layer, C/m²\n\n",
|
"\t%11.3e sigma, diffuse layer, C/m²\n\n",
|
||||||
#endif
|
#endif
|
||||||
(double) charge_ptr->Get_sigmaddl()));
|
(double) charge_ptr->Get_sigmaddl()));
|
||||||
}
|
}
|
||||||
@ -1951,7 +1952,7 @@ print_surface_cd_music(void)
|
|||||||
#ifdef NO_UTF8_ENCODING
|
#ifdef NO_UTF8_ENCODING
|
||||||
output_msg(sformatf("\tundefined sigma, C/m2\n"));
|
output_msg(sformatf("\tundefined sigma, C/m2\n"));
|
||||||
#else
|
#else
|
||||||
output_msg(sformatf("\tundefined sigma, C/m²\n"));
|
output_msg(sformatf("\tundefined sigma, C/m²\n"));
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
output_msg(sformatf("\t%11.3e psi, plane 0, V\n",
|
output_msg(sformatf("\t%11.3e psi, plane 0, V\n",
|
||||||
@ -2210,7 +2211,7 @@ print_totals(void)
|
|||||||
"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",
|
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
|
||||||
}
|
}
|
||||||
/* VP: Density Start */
|
/* VP: Density Start */
|
||||||
@ -2220,7 +2221,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("%46s%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())
|
||||||
@ -2245,7 +2246,7 @@ print_totals(void)
|
|||||||
" (solute contributions limited to 200 oC)"));
|
" (solute contributions limited to 200 oC)"));
|
||||||
#else
|
#else
|
||||||
output_msg(sformatf("%19s\n",
|
output_msg(sformatf("%19s\n",
|
||||||
" (solute contributions limited to 200 °C)"));
|
" (solute contributions limited to 200 °C)"));
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
else output_msg(sformatf("\n"));
|
else output_msg(sformatf("\n"));
|
||||||
@ -2275,7 +2276,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("%46s%6.2f\n", "Temperature (°C) = ",
|
output_msg(sformatf("%46s%6.2f\n", "Temperature (°C) = ",
|
||||||
#endif
|
#endif
|
||||||
(double) tc_x));
|
(double) tc_x));
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user