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

Squashed 'src/' changes from 70e32eba..fb3f60ce

Browse Source 
fb3f60ce Merge commit '09af2d5b127a8efe403f47751c7c8465ec94874d'
09af2d5b Squashed 'phreeqcpp/' changes from cb6d9f4..3d5242f

git-subtree-dir: src
git-subtree-split: fb3f60ce26395696273caf5cdf9f3415fca60d5a
This commit is contained in:
Darth Vader 2024-05-27 19:32:06 +00:00
parent 06332bcb62
commit 7552f8f680
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phreeqcpp/tidy.cpp
View File

@ -5431,6 +5431,16 @@ tidy_isotope_ratios(void)
/* /*
* Mark master species list as minor isotope * Mark master species list as minor isotope
*/ */
if (isotope_ratio[i]->isotope_name == NULL)
{
input_error++;
error_string = sformatf(
"For ISOTOPE_RATIO, did not find ISOTOPE name for this isotope ratio %s",
isotope_ratio[i]->name);
error_msg(error_string, CONTINUE);
continue;
}
master_isotope_ptr = master_isotope_ptr =
master_isotope_search(isotope_ratio[i]->isotope_name); master_isotope_search(isotope_ratio[i]->isotope_name);
if (master_isotope_ptr == NULL) if (master_isotope_ptr == NULL)

4
phreeqcpp/utilities.cpp
View File

@ -41,6 +41,10 @@ calc_alk(CReaction& rxn_ref)
break; break;
} }
return_value += r_token->coef * master_ptr->alk; return_value += r_token->coef * master_ptr->alk;
//if (strcmp(r_token->name, "e-") == 0 && strcmp(rxn_ref.token[0].name,"e-") != 0)
//{
// std::cerr << rxn_ref.token[0].name << " Non-master species has e- in reaction.\n";
//}
r_token++; r_token++;
} }
return (return_value); return (return_value);