max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 00:28:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Try updated logical expression

Browse Source
This commit is contained in:
Charlton, Scott R 2023-10-31 13:34:41 -06:00
parent 812061be2c
commit 9b10ce3f5c
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
phreeqcpp/prep.cpp
View File

@ -5404,10 +5404,6 @@ calc_vm(LDBLE tc, LDBLE pa)
return OK;
}
#if defined(__INTEL_LLVM_COMPILER)
#pragma optimize( "", off )
#endif
/* ---------------------------------------------------------------------- */
int Phreeqc::
k_temp(LDBLE tc, LDBLE pa) /* pa - pressure in atm */
@ -5417,7 +5413,9 @@ k_temp(LDBLE tc, LDBLE pa) /* pa - pressure in atm */
* Calculates log k's for all species and pure_phases
*/
if (tc == current_tc && pa == current_pa && ((fabs(mu_x - current_mu) < 1e-3 * mu_x) || !mu_terms_in_logk))
// if (tc == current_tc && pa == current_pa && ((fabs(mu_x - current_mu) < 1e-3 * mu_x) || !mu_terms_in_logk))
// return OK;
if (tc != current_tc || pa != current_pa || !((fabs(mu_x - current_mu) < 1e-3 * mu_x) || !mu_terms_in_logk))
return OK;
int i;
@ -5482,10 +5480,6 @@ k_temp(LDBLE tc, LDBLE pa) /* pa - pressure in atm */
return (OK);
}
#if defined(__INTEL_LLVM_COMPILER)
#pragma optimize( "", on )
#endif
/* ---------------------------------------------------------------------- */
LDBLE Phreeqc::
k_calc(LDBLE * l_logk, LDBLE tempk, LDBLE presPa)