From 4df51ec326b8d097a95a1d93c37c6ee96936239e Mon Sep 17 00:00:00 2001 From: Darth Vader Date: Fri, 7 Jun 2024 21:57:44 +0000 Subject: [PATCH] Squashed 'src/' changes from e2f4d060..ceab9a10 ceab9a10 Tony's change to Sr and NH4, SC_Ohm and rate_xmpls, basicsubs.cpp error git-subtree-dir: src git-subtree-split: ceab9a1033d2046c72a6bcf19c2c2244e8b23f97 --- basicsubs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basicsubs.cpp b/basicsubs.cpp index 14744601a..a9305f735 100644 --- a/basicsubs.cpp +++ b/basicsubs.cpp @@ -493,7 +493,7 @@ calc_SC(void) if (av) t1 *= pow(viscos_0 / viscos, av); if (correct_Dw) - s_x[i]->dw_corr *= t1 / Dw; + s_x[i]->dw_corr *= t1 / Dw * pow(mass_water_aq_x / calc_solution_volume(), 2); // fractional contribution in mu, and correct for charge imbalance a2 = 2 / (eq_plus + eq_min);