mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-16 08:38:23 +01:00
Merge commit '3782d4420d3d6282315acfecf33b3c7e7da333d0'
This commit is contained in:
Darth Vader
commit
6e38872a51
@ -109,7 +109,10 @@ main_method(int argc, char *argv[])
|
|||||||
{
|
{
|
||||||
return errors;
|
return errors;
|
||||||
}
|
}
|
||||||
|
#ifndef NO_UTF8_ENCODING
|
||||||
#ifdef DOS
|
#ifdef DOS
|
||||||
|
SetConsoleOutputCP(CP_UTF8);
|
||||||
|
#endif
|
||||||
write_banner();
|
write_banner();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -199,7 +202,10 @@ main_method(int argc, char *argv[])
|
|||||||
{
|
{
|
||||||
return errors;
|
return errors;
|
||||||
}
|
}
|
||||||
|
#ifndef NO_UTF8_ENCODING
|
||||||
#ifdef DOS
|
#ifdef DOS
|
||||||
|
SetConsoleOutputCP(CP_UTF8);
|
||||||
|
#endif
|
||||||
write_banner();
|
write_banner();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -271,9 +277,9 @@ write_banner(void)
|
|||||||
char buffer[80];
|
char buffer[80];
|
||||||
int len, indent;
|
int len, indent;
|
||||||
screen_msg(
|
screen_msg(
|
||||||
" ÛßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßÛ\n");
|
" █▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀█\n");
|
||||||
screen_msg(
|
screen_msg(
|
||||||
" º º\n");
|
" ║ ║\n");
|
||||||
|
|
||||||
/* version */
|
/* version */
|
||||||
#ifdef NPP
|
#ifdef NPP
|
||||||
@ -282,21 +288,21 @@ write_banner(void)
|
|||||||
len = sprintf(buffer, "* PHREEQC-%s *", "@VERSION@");
|
len = sprintf(buffer, "* PHREEQC-%s *", "@VERSION@");
|
||||||
#endif
|
#endif
|
||||||
indent = (44 - len) / 2;
|
indent = (44 - len) / 2;
|
||||||
screen_msg(sformatf("%14cº%*c%s%*cº\n", ' ', indent, ' ', buffer,
|
screen_msg(sformatf("%14c║%*c%s%*c║\n", ' ', indent, ' ', buffer,
|
||||||
44 - indent - len, ' '));
|
44 - indent - len, ' '));
|
||||||
|
|
||||||
screen_msg(
|
screen_msg(
|
||||||
" º º\n");
|
" ║ ║\n");
|
||||||
screen_msg(
|
screen_msg(
|
||||||
" º A hydrogeochemical transport model º\n");
|
" ║ A hydrogeochemical transport model ║\n");
|
||||||
screen_msg(
|
screen_msg(
|
||||||
" º º\n");
|
" ║ ║\n");
|
||||||
screen_msg(
|
screen_msg(
|
||||||
" º by º\n");
|
" ║ by ║\n");
|
||||||
screen_msg(
|
screen_msg(
|
||||||
" º D.L. Parkhurst and C.A.J. Appelo º\n");
|
" ║ D.L. Parkhurst and C.A.J. Appelo ║\n");
|
||||||
screen_msg(
|
screen_msg(
|
||||||
" º º\n");
|
" ║ ║\n");
|
||||||
|
|
||||||
|
|
||||||
/* date */
|
/* date */
|
||||||
@ -306,11 +312,11 @@ write_banner(void)
|
|||||||
len = sprintf(buffer, "%s", "@VER_DATE@");
|
len = sprintf(buffer, "%s", "@VER_DATE@");
|
||||||
#endif
|
#endif
|
||||||
indent = (44 - len) / 2;
|
indent = (44 - len) / 2;
|
||||||
screen_msg(sformatf("%14cº%*c%s%*cº\n", ' ', indent, ' ', buffer,
|
screen_msg(sformatf("%14c║%*c%s%*c║\n", ' ', indent, ' ', buffer,
|
||||||
44 - indent - len, ' '));
|
44 - indent - len, ' '));
|
||||||
|
|
||||||
screen_msg(
|
screen_msg(
|
||||||
" ÛÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÛ\n\n");
|
" █▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄█\n\n");
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -485,7 +491,7 @@ process_file_names(int argc, char *argv[], std::istream **db_cookie,
|
|||||||
}
|
}
|
||||||
local_database_file->close();
|
local_database_file->close();
|
||||||
delete local_database_file;
|
delete local_database_file;
|
||||||
|
|
||||||
user_database = (char *) free_check_null(user_database);
|
user_database = (char *) free_check_null(user_database);
|
||||||
user_database = string_duplicate(token);
|
user_database = string_duplicate(token);
|
||||||
screen_msg(sformatf("Database file: %s\n\n", token));
|
screen_msg(sformatf("Database file: %s\n\n", token));
|
||||||
|
|||||||
@ -1483,7 +1483,7 @@ print_species(void)
|
|||||||
#ifdef NO_UTF8_ENCODING
|
#ifdef NO_UTF8_ENCODING
|
||||||
"Molality", "Activity", "Molality", "Activity", "Gamma", "cm3/mol"));
|
"Molality", "Activity", "Molality", "Activity", "Gamma", "cm3/mol"));
|
||||||
#else
|
#else
|
||||||
"Molality", "Activity", "Molality", "Activity", "Gamma", "cm³/mol"));
|
"Molality", "Activity", "Molality", "Activity", "Gamma", "cm³/mol"));
|
||||||
#endif
|
#endif
|
||||||
/*
|
/*
|
||||||
* Print list of species
|
* Print list of species
|
||||||
@ -1651,7 +1651,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() *
|
||||||
@ -1662,7 +1662,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)
|
||||||
@ -1684,7 +1684,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()));
|
||||||
@ -1692,7 +1692,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()),
|
||||||
@ -1705,7 +1705,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()));
|
||||||
@ -1713,7 +1713,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()),
|
||||||
@ -1726,13 +1726,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()),
|
||||||
@ -1948,28 +1948,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()));
|
||||||
}
|
}
|
||||||
@ -1978,7 +1978,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",
|
||||||
@ -2236,7 +2236,7 @@ print_totals(void)
|
|||||||
#ifdef NO_UTF8_ENCODING
|
#ifdef NO_UTF8_ENCODING
|
||||||
"Specific Conductance (uS/cm, ", tc_x, "oC) = ", (int) SC));
|
"Specific Conductance (uS/cm, ", tc_x, "oC) = ", (int) SC));
|
||||||
#else
|
#else
|
||||||
"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 */
|
||||||
@ -2246,7 +2246,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("%45s%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())
|
||||||
@ -2270,7 +2270,7 @@ print_totals(void)
|
|||||||
#ifdef NO_UTF8_ENCODING
|
#ifdef NO_UTF8_ENCODING
|
||||||
" (solute contributions limited to 200 oC)"));
|
" (solute contributions limited to 200 oC)"));
|
||||||
#else
|
#else
|
||||||
" (solute contributions limited to 200 °C)"));
|
" (solute contributions limited to 200 °C)"));
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
else output_msg(sformatf("\n"));
|
else output_msg(sformatf("\n"));
|
||||||
@ -2300,7 +2300,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("%45s%6.2f\n", "Temperature (°C) = ",
|
||||||
#endif
|
#endif
|
||||||
(double) tc_x));
|
(double) tc_x));
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
#include "Utils.h"
|
#include "Utils.h"
|
||||||
#include "Phreeqc.h"
|
#include "Phreeqc.h"
|
||||||
#include "phqalloc.h"
|
#include "phqalloc.h"
|
||||||
#include "Exchange.h"
|
#include "Exchange.h"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user