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

Added phi to gas_phase print. Test case gas_phase_pressure

Browse Source 
Still need to debug problem with gas_phase not working correctly from Thomas Baumann.

Fixed spread problem with mass of water. Test case MassWater

Problems with kinetics and small concentrations (Benoit and Janek) still unresolved.

Added test cases to Makefile

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7642 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2013-04-24 15:31:49 +00:00
parent 40e97fd96c
commit 4cb5d32f0d
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
print.cpp
View File

@ -1220,10 +1220,18 @@ print_saturation_indices(void)
phases[i]->name, (double) si, pr_in, (double) iap, (double) lk,
phases[i]->formula));
if (gas && phases[i]->pr_in && phases[i]->pr_p)
output_msg(sformatf("\t%s%5.1f%s%5.3f%s",
{
if (fabs(phases[i]->pr_p - pow(10, si) / phases[i]->pr_phi) > 0.1)
{
output_msg(sformatf("\t%s%5.1f%s%5.3f%s",
" Pressure ", (double) pow(10, si) / phases[i]->pr_phi, " atm, phi ", (double) phases[i]->pr_phi, "."));
} else
{
output_msg(sformatf("\t%s%5.1f%s%5.3f%s",
" Pressure ", (double) phases[i]->pr_p, " atm, phi ", (double) phases[i]->pr_phi, "."));
}
}
output_msg("\n");
}
output_msg("\n\n");

3
spread.cpp
View File

@ -801,7 +801,8 @@ spread_row_to_solution(struct spread_row *heading, struct spread_row *units,
break;
case 10: /* water */
{
next_char = char_string;
//next_char = char_string;
//int j = copy_token(token, &next_char); // read identifier "water"
int j = copy_token(token, &next_char);
if (j == EMPTY)
{