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

replace species_hash_table with species_map

Browse Source
This commit is contained in:
David Parkhurst 2021-03-21 18:16:36 -06:00
parent 8bff6d3666
commit effafe0a76
4 changed files with 28 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Phreeqc.cpp
View File

@ -908,7 +908,6 @@ void Phreeqc::init(void)
/*
* Hash definitions
*/
species_hash_table = NULL;
phases_hash_table = NULL;
logk_hash_table = NULL;
master_isotope_hash_table = NULL;

2
Phreeqc.h
View File

@ -1661,7 +1661,7 @@ protected:
std::map<std::string, std::string *> strings_map;
std::map<std::string, struct element*> elements_map;
HashTable *species_hash_table;
std::map<std::string, struct species*> species_map;
HashTable *phases_hash_table;
HashTable *logk_hash_table;
HashTable *master_isotope_hash_table;

1
mainsubs.cpp
View File

@ -66,7 +66,6 @@ initialize(void)
*/
hcreate_multi((unsigned) MAX_S, &logk_hash_table);
hcreate_multi((unsigned) MAX_ELTS, &master_isotope_hash_table);
hcreate_multi((unsigned) MAX_S, &species_hash_table);
hcreate_multi((unsigned) MAX_PHASES, &phases_hash_table);
// user_print

78
structures.cpp
View File

@ -234,10 +234,9 @@ clean_up(void)
sit_clean_up();
/* hash tables */
elements_map.clear();
hdestroy_multi(species_hash_table);
species_map.clear();
hdestroy_multi(logk_hash_table);
hdestroy_multi(phases_hash_table);
species_hash_table = NULL;
logk_hash_table = NULL;
phases_hash_table = NULL;
/* strings */
@ -1946,39 +1945,30 @@ s_init(struct species *s_ptr)
s_ptr->original_deltav_units = cm3_per_mol;
return (OK);
}
/* ---------------------------------------------------------------------- */
struct species * Phreeqc::
s_search(const char *name)
struct species* Phreeqc::
s_search(const char* name)
/* ---------------------------------------------------------------------- */
{
/*
* Function locates the string "name" in the hash table for species.
*
* Arguments:
* name input, a character string to be located in species.
* i is obsolete.
*
* Returns:
* If found, pointer to the appropriate species structure is returned.
* else, NULL pointer is returned.
*/
struct species *s_ptr;
ENTRY item, *found_item;
char safe_name[MAX_LENGTH];
strcpy(safe_name, name);
item.key = safe_name;
item.data = NULL;
found_item = hsearch_multi(species_hash_table, item, FIND);
if (found_item != NULL)
/*
* Function locates the string "name" in the species_map.
*
* Arguments:
* name input, a character string to be located in species.
*
* Returns:
* If found, pointer to the appropriate species structure is returned.
* else, NULL pointer is returned.
*/
struct species* s_ptr = NULL;
std::map<std::string, struct species*>::iterator s_it =
species_map.find(name);
if (s_it == species_map.find(name))
{
s_ptr = (struct species *) (found_item->data);
return (s_ptr);
s_ptr = s_it->second;
}
return (NULL);
return (s_ptr);
}
/* ---------------------------------------------------------------------- */
struct species * Phreeqc::
s_store(const char *name, LDBLE l_z, int replace_if_found)
@ -2007,30 +1997,24 @@ s_store(const char *name, LDBLE l_z, int replace_if_found)
* Returns:
* pointer to species structure "s" where "name" can be found.
*/
int n;
struct species *s_ptr;
ENTRY item, *found_item;
/*
* Search list
*/
item.key = name;
item.data = NULL;
found_item = hsearch_multi(species_hash_table, item, FIND);
if (found_item != NULL && replace_if_found == FALSE)
struct species* s_ptr = NULL;
s_ptr = s_search(name);
if (s_ptr != NULL && replace_if_found == FALSE)
{
s_ptr = (struct species *) (found_item->data);
return (s_ptr);
}
else if (found_item != NULL && replace_if_found == TRUE)
else if (s_ptr != NULL && replace_if_found == TRUE)
{
s_ptr = (struct species *) (found_item->data);
s_free(s_ptr);
s_init(s_ptr);
}
else
{
n = (int)s.size();
size_t n = s.size();
s.resize((size_t)n + 1);
/* Make new species structure */
s[n] = s_alloc();
@ -2040,17 +2024,9 @@ s_store(const char *name, LDBLE l_z, int replace_if_found)
s_ptr->name = string_hsave(name);
s_ptr->z = l_z;
/*
* Update hash table
* Update map
*/
item.key = s_ptr->name;
item.data = (void *) s_ptr;
found_item = hsearch_multi(species_hash_table, item, ENTER);
if (found_item == NULL)
{
error_string = sformatf( "Hash table error in species_store.");
error_msg(error_string, CONTINUE);
}
species_map[name] = s_ptr;
return (s_ptr);
}
/* **********************************************************************