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

Squashed 'phreeqcpp/' changes from a376a40..40f9a93

Browse Source 
40f9a93 phase_compare is obsolete
1a07c70 remove qsort for phases, elements, and species
23dd4ac merging Merge branch 'master' into surf_related
bf534d5 changed -10 to -15 for estimate of surface charge la
404aa0f changed -5 to -10 for estimating related surface activity

git-subtree-dir: phreeqcpp
git-subtree-split: 40f9a93535eea4367f6be8a2ecb9da4a9a0172a7
This commit is contained in:
Darth Vader 2021-11-09 01:59:31 +00:00
parent e265665845
commit 754ea3a9bc
4 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Phreeqc.h
View File

@ -851,7 +851,9 @@ public:
class master* surface_get_psi_master(const char* name, int plane);
//
class phase* phase_bsearch(const char* cptr, int* j, int print);
#ifdef OBSOLETE
static int phase_compare(const void* ptr1, const void* ptr2);
#endif
int phase_delete(int i);
class phase* phase_store(const char* name);
//

2
model.cpp
View File

@ -3361,7 +3361,7 @@ reset(void)
}
if (old_moles <= 0 && x[i]->moles > 0)
{
x[i]->master[0]->s->la = log10(x[i]->moles) - 5.;
x[i]->master[0]->s->la = log10(x[i]->moles) - 15.;
}
}
else if (comp_ptr->Get_phase_name().size() > 0)

4
structures.cpp
View File

@ -1080,7 +1080,7 @@ phase_alloc(void)
phase_init(phase_ptr);
return (phase_ptr);
}
#ifdef OBSOLETE
/* ---------------------------------------------------------------------- */
int Phreeqc::
phase_compare(const void *ptr1, const void *ptr2)
@ -1094,7 +1094,7 @@ phase_compare(const void *ptr1, const void *ptr2)
phase_ptr2 = *(const class phase **) ptr2;
return (strcmp_nocase(phase_ptr1->name, phase_ptr2->name));
}
#endif
/* ---------------------------------------------------------------------- */
int Phreeqc::
phase_compare_string(const void *ptr1, const void *ptr2)

41
tidy.cpp
View File

@ -155,18 +155,39 @@ tidy_model(void)
* Sort arrays
*/
/* species */
if (new_model == TRUE)
{
if (s.size() > 1) qsort(&s[0], s.size(), sizeof(class species *), s_compare);
/* master species */
if (master.size() > 1) qsort(&master[0], master.size(), sizeof(class master *), master_compare);
/* elements */
if (elements.size() > 1) qsort(&elements[0], elements.size(), sizeof(class element *), element_compare);
/* phases */
if (phases.size() > 1) qsort(&phases[0], phases.size(), sizeof(class phase *), phase_compare);
/* species */
if (s.size() > 1) //qsort(&s[0], s.size(), sizeof(class species*), s_compare);
{
s.clear();
std::map<std::string, class species*>::iterator it;
for (it = species_map.begin(); it != species_map.end(); it++)
{
s.push_back(it->second);
}
}
/* master species */
if (master.size() > 1) qsort(&master[0], master.size(), sizeof(class master*), master_compare);
/* elements */
if (elements.size() > 1) //qsort(&elements[0], elements.size(), sizeof(class element*), element_compare);
{
elements.clear();
std::map<std::string, class element*>::iterator it;
for (it = elements_map.begin(); it != elements_map.end(); it++)
{
elements.push_back(it->second);
}
} /* phases */
if (phases.size() > 1) //qsort(&phases[0], phases.size(), sizeof(class phase *), phase_compare);
{
phases.clear();
std::map<std::string, class phase*>::iterator it;
for (it = phases_map.begin(); it != phases_map.end(); it++)
{
phases.push_back(it->second);
}
}
}
/* named_log_k */