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

Squashed 'phreeqcpp/' changes from 60ccbf8..c035d9c

Browse Source 
c035d9c Tony updates to phreeqc_rates.dat. Added albite_rates. Copy/paste error in read.cpp
fcec621 basicsubs.cpp fix from Tony
e5b4b11 Fixed some HTML, still a problem with colors of links.

git-subtree-dir: phreeqcpp
git-subtree-split: c035d9c3b76f807db7d87066c235c9f6867e5497
This commit is contained in:
Darth Vader 2024-05-09 19:46:42 +00:00
parent 4a24a89572
commit bacfb0ea50
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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
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;
} }