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 'src/' changes from 99451c08..d5808fd1

Browse Source 
d5808fd1 Merge commit '6ea0442d458c0a029140954f6c801006cac0871b'
6ea0442d Squashed 'phreeqcpp/' changes from 8dade82..bd2e2b6

git-subtree-dir: src
git-subtree-split: d5808fd1883cb30122c94d058584f462e0af4074
This commit is contained in:
Darth Vader 2023-08-25 15:29:56 +00:00
parent fb29ba4c3a
commit 1a3663493c
1 changed files with 732 additions and 732 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phreeqcpp/basicsubs.cpp
View File

@ -1239,7 +1239,7 @@ calc_t_sc(const char *name)
strcpy(token, name);
s_ptr = s_search(token);
if (s_ptr != NULL)
if (s_ptr != NULL && s_ptr->in)
{
if (!s_ptr->z)
return (0);
@ -1249,7 +1249,7 @@ calc_t_sc(const char *name)
LDBLE t = s_ptr->dw_t_SC * 1e7 * F_C_MOL * F_C_MOL / (R_KJ_DEG_MOL * 298150.0) * viscos_0_25 / viscos_0;
return (t / SC);
}
return (-999.99);
return (0);
}
/* ---------------------------------------------------------------------- */
@ -1264,7 +1264,7 @@ calc_f_visc(const char *name)
{
strcpy(token, name);
s_ptr = s_search(token);
if (s_ptr != NULL)
if (s_ptr != NULL && s_ptr->in)
return s_ptr->dw_t_visc;
}
return 0;