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

latest, fixed bug from R with relative dielectric

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8756 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2014-05-20 20:42:32 +00:00
parent 6a75a7f38b
commit aa40f2e705
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.old
View File

@ -173,7 +173,7 @@ ifeq ($(CFG), CLASS_RELEASE_64)
CL1MP_OBJS=cl1mp.o
CL1MP_LIB=/usr/lib64/libgmp.a
endif
DEFINES = -DNDEBUG $(DEFINE_INVERSE_CL1MP) # -DPHREEQC2
DEFINES = -DNDEBUG $(DEFINE_INVERSE_CL1MP) -DR_SO # -DPHREEQC2
VPATH = ..
INCLUDES = -I..
CXX = g++

6
tidy.cpp
View File

@ -3007,7 +3007,11 @@ tidy_species(void)
if (master[i]->gfw <= 0.0)
{
if (master[i]->type >= EMINUS) continue;
if ((strcmp(master[i]->elt->name, "E") != 0) && (strcmp(master[i]->elt->name, "e") != 0))
if ((strcmp(master[i]->elt->name, "E") != 0) &&
(strcmp(master[i]->elt->name, "e") != 0) &&
(strcmp(master[i]->elt->name, "H(1)") != 0) &&
(strcmp(master[i]->elt->name, "O(-2)") != 0)
)
{
input_error++;
error_string = sformatf(