From 819297a462aeed544de7135bbab43d6e715d543d Mon Sep 17 00:00:00 2001 From: Darth Vader Date: Thu, 9 May 2024 19:50:49 +0000 Subject: [PATCH] Squashed 'src/' changes from 60ccbf83..c035d9c3 c035d9c3 Tony updates to phreeqc_rates.dat. Added albite_rates. Copy/paste error in read.cpp fcec621e basicsubs.cpp fix from Tony e5b4b11e Fixed some HTML, still a problem with colors of links. git-subtree-dir: src git-subtree-split: c035d9c3b76f807db7d87066c235c9f6867e5497 --- basicsubs.cpp | 4 ++-- read.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/basicsubs.cpp b/basicsubs.cpp index 3ef3d6c5e..7b5a6f285 100644 --- a/basicsubs.cpp +++ b/basicsubs.cpp @@ -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(); diff --git a/read.cpp b/read.cpp index 5a30d1c68..f3a556b85 100644 --- a/read.cpp +++ b/read.cpp @@ -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; }