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

Merge commit '3770354f0a980a6a5c3001bdf061d9543cb23c11'

Browse Source
This commit is contained in:
Darth Vader 2021-03-18 19:25:43 +00:00
commit f03c3f7ca2
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phreeqcpp/parse.cpp
View File

@ -140,8 +140,6 @@ parse_eq(char *eqn, struct elt_list **elt_ptr, int association)
/* /*
* Sort elements in reaction and combine * Sort elements in reaction and combine
*/ */
//qsort(elt_list[0], (size_t) count_elts, sizeof(struct elt_list),
// elt_list_compare);
if (elt_list_combine() == ERROR) if (elt_list_combine() == ERROR)
return (ERROR); return (ERROR);
/* /*

2
phreeqcpp/read.cpp
View File

@ -1665,7 +1665,7 @@ read_inverse(void)
{ {
qsort(inverse[n].isotopes, qsort(inverse[n].isotopes,
(size_t) inverse[n].count_isotopes, (size_t) inverse[n].count_isotopes,
(size_t) sizeof(struct inv_isotope), inverse_isotope_compare); sizeof(struct inv_isotope), inverse_isotope_compare);
} }
if (inverse[n].count_i_u > 0) if (inverse[n].count_i_u > 0)

6
phreeqcpp/structures.cpp
View File

@ -962,7 +962,7 @@ master_bsearch(const char *ptr)
return (NULL); return (NULL);
} }
void_ptr = bsearch((const char *) ptr, void_ptr = bsearch((const char *) ptr,
(char *) master[0], (char *) &master[0],
master.size(), master.size(),
sizeof(struct master *), master_compare_string); sizeof(struct master *), master_compare_string);
if (void_ptr == NULL) if (void_ptr == NULL)
@ -970,7 +970,7 @@ master_bsearch(const char *ptr)
char * dup = string_duplicate(ptr); char * dup = string_duplicate(ptr);
replace("(+","(", dup); replace("(+","(", dup);
void_ptr = bsearch((const char *) dup, void_ptr = bsearch((const char *) dup,
(char*)master[0], (char*)&master[0],
master.size(), master.size(),
sizeof(struct master*), master_compare_string); sizeof(struct master*), master_compare_string);
dup = (char *) free_check_null(dup); dup = (char *) free_check_null(dup);
@ -1258,7 +1258,7 @@ phase_bsearch(const char *ptr, int *j, int print)
{ {
void_ptr = (void *) void_ptr = (void *)
bsearch((char *) ptr, bsearch((char *) ptr,
(char *) phases[0], (char *) &phases[0],
phases.size(), phases.size(),
sizeof(struct phase *), phase_compare_string); sizeof(struct phase *), phase_compare_string);
} }

8
phreeqcpp/tidy.cpp
View File

@ -150,14 +150,14 @@ tidy_model(void)
/* species */ /* species */
if (new_model == TRUE) if (new_model == TRUE)
{ {
qsort(s[0], s.size(), sizeof(struct species *), s_compare); qsort(&s[0], s.size(), sizeof(struct species *), s_compare);
/* master species */ /* master species */
qsort(master[0], master.size(), sizeof(struct master *), master_compare); qsort(&master[0], master.size(), sizeof(struct master *), master_compare);
/* elements */ /* elements */
qsort(elements[0], elements.size(), sizeof(struct element *), element_compare); qsort(&elements[0], elements.size(), sizeof(struct element *), element_compare);
/* phases */ /* phases */
qsort(phases[0], phases.size(), sizeof(struct phase *), phase_compare); qsort(&phases[0], phases.size(), sizeof(struct phase *), phase_compare);
} }