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 c767e9c6..edd80cec

Browse Source 
edd80cec Merge commit 'bacfb0ea50c83434d21d3b0c8eda18543ee8b89a'
bacfb0ea Squashed 'phreeqcpp/' changes from 60ccbf8..c035d9c

git-subtree-dir: src
git-subtree-split: edd80cecf2ebc91f889e31872355bb6450bc9c0a
This commit is contained in:
Darth Vader 2024-05-09 19:46:50 +00:00
parent a159b5af31
commit 9882e3df3c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phreeqcpp/basicsubs.cpp
View File

@ -1759,7 +1759,7 @@ pr_pressure(const char* phase_name)
class phase* phase_ptr_gas = phase_bsearch(gas_comp_ptr->Get_phase_name().c_str(), &j, FALSE);
if (phase_ptr == phase_ptr_gas)
{
if (gas_phase_ptr->Get_pr_in())
if (gas_phase_ptr->Get_pr_in() && phase_ptr->moles_x)
{
return phase_ptr->pr_p;
}
@ -1807,7 +1807,7 @@ pr_phi(const char* phase_name)
class phase* phase_ptr_gas = phase_bsearch(gas_comp_ptr->Get_phase_name().c_str(), &j, FALSE);
if (phase_ptr == phase_ptr_gas)
{
if (gas_phase_ptr->Get_pr_in())
if (gas_phase_ptr->Get_pr_in() && phase_ptr->moles_x)
return phase_ptr->pr_phi;
else
return gas_comp_ptr->Get_phi();

4
phreeqcpp/read.cpp
View File

@ -2439,7 +2439,7 @@ read_mean_gammas(void)
/* ---------------------------------------------------------------------- */
{
/*
* Reads kinetics data
* Reads MEAN_GAMMAS data
*
* Arguments:
* none
@ -2540,7 +2540,7 @@ read_mean_gammas(void)
break;
case OPTION_ERROR:
input_error++;
error_msg("Unknown input in KINETICS keyword.", CONTINUE);
error_msg("Unknown input in MEAN_GAMMAS keyword.", CONTINUE);
error_msg(line_save, CONTINUE);
break;
}