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

Merge commit '9882e3df3cca85659da2a430ffe240f895cdb272'

Browse Source
This commit is contained in:
Darth Vader 2024-05-09 19:46:51 +00:00
commit fcaf4393f9
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); class phase* phase_ptr_gas = phase_bsearch(gas_comp_ptr->Get_phase_name().c_str(), &j, FALSE);
if (phase_ptr == phase_ptr_gas) 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; 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); class phase* phase_ptr_gas = phase_bsearch(gas_comp_ptr->Get_phase_name().c_str(), &j, FALSE);
if (phase_ptr == phase_ptr_gas) 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; return phase_ptr->pr_phi;
else else
return gas_comp_ptr->Get_phi(); 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: * Arguments:
* none * none
@ -2540,7 +2540,7 @@ read_mean_gammas(void)
break; break;
case OPTION_ERROR: case OPTION_ERROR:
input_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); error_msg(line_save, CONTINUE);
break; break;
} }