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

Merge commit '37de8fa93ce958aeed5e61f6b3b3e507f059257e'

Browse Source
This commit is contained in:
Darth Vader 2021-05-12 13:56:26 +00:00
commit 510744efa1
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phreeqcpp/mainsubs.cpp
View File

@ -73,6 +73,11 @@ initialize(void)
change_surf[0].next = TRUE;
change_surf[1].cell_no = -99;
change_surf[1].next = FALSE;
/*
* define constant named log_k
*/
class logk* logk_ptr = logk_store("XconstantX", TRUE);
read_log_k_only("1.0", &logk_ptr->log_k[0]);
#ifdef PHREEQCI_GUI
g_spread_sheet.heading = NULL;

15
phreeqcpp/tidy.cpp
View File

@ -3800,6 +3800,21 @@ tidy_min_surface(void)
*/
for (int jj = 0; jj < count_elts; jj++)
{
if (elt_list[jj].elt->primary == NULL)
{
error_string = sformatf("Primary master species missing for %s",
elt_list[jj].elt->name);
error_msg(error_string, CONTINUE);
break;
}
if (elt_list[jj].elt->primary->s == NULL)
{
error_string = sformatf(
"Species missing for %s", elt_list[jj].elt->name);
error_msg(error_string, CONTINUE);
break;
}
if (elt_list[jj].elt->primary->s->type != SURF
&& elt_list[jj].coef < 0
//&& elt_list[jj].elt->primary->s != s_hplus