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

Fix print of PR gases in saturation_indices.

Browse Source 
more replacing '.

Amm.dat and pitzer.dat updated to GCA paper.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7656 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2013-04-29 16:05:21 +00:00
parent 6911259725
commit 0607e086c5
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mainsubs.cpp
View File

@ -1570,7 +1570,7 @@ initial_gas_phases(int print)
print_gas_phase();
if (PR /*&& use.Get_gas_phase_ptr()->total_p > 1.0*/)
warning_msg("While initializing gas phase composition by equilibrating:\n"
" Found definitions of gas' critical temperature and pressure.\n"
" Found definitions of gas` critical temperature and pressure.\n"
" Going to use Peng-Robinson in subsequent calculations.\n");
xgas_save(n_user);
punch_all();

13
print.cpp
View File

@ -1219,17 +1219,10 @@ print_saturation_indices(void)
output_msg(sformatf("\t%-15s%7.2f%2s%8.2f%8.2f %s",
phases[i]->name, (double) si, pr_in, (double) iap, (double) lk,
phases[i]->formula));
if (gas_in && phases[i]->pr_in && phases[i]->pr_p)
if (gas && phases[i]->pr_in && phases[i]->pr_p && (phases[i]->moles_x || state == 1))
{
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(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");
}

2
read.cpp
View File

@ -2842,7 +2842,7 @@ read_aq_species_vm_parms(char *ptr, LDBLE * delta_v)
if (j < 1)
{
input_error++;
error_msg("Expecting numeric values for calculating the species' molar volume from the supcrt database.",
error_msg("Expecting numeric values for calculating the species molar volume from the supcrt database.",
CONTINUE);
return (ERROR);
}