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

Bug with quick_setup, pp_assemblage did not compare without case. Failed in transport when one cell had Ferrihydrite and the other had ferrihydrite.

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9308 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2015-02-24 23:39:34 +00:00
parent c3defbf429
commit a67f52b863
2 changed files with 5 additions and 4582 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4579
phreeqc.rev
View File

File diff suppressed because it is too large Load Diff

8
prep.cpp
View File

@ -195,9 +195,11 @@ quick_setup(void)
{
cxxPPassemblage * pp_assemblage_ptr = use.Get_pp_assemblage_ptr();
std::map<std::string, cxxPPassemblageComp>::iterator it;
it = pp_assemblage_ptr->Get_pp_assemblage_comps().find(x[i]->pp_assemblage_comp_name);
assert(it != pp_assemblage_ptr->Get_pp_assemblage_comps().end());
cxxPPassemblageComp * comp_ptr = &(it->second);
//it = pp_assemblage_ptr->Get_pp_assemblage_comps().find(x[i]->pp_assemblage_comp_name);
cxxPPassemblageComp * comp_ptr = pp_assemblage_ptr->Find(x[i]->pp_assemblage_comp_name);
assert(comp_ptr != NULL);
//assert(it != pp_assemblage_ptr->Get_pp_assemblage_comps().end());
//cxxPPassemblageComp * comp_ptr = &(it->second);
x[i]->pp_assemblage_comp_ptr = comp_ptr;
x[i]->moles = comp_ptr->Get_moles();
/* A. Crapsi */