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

finished master_isotope

Browse Source
This commit is contained in:
David Parkhurst 2021-03-15 10:21:07 -06:00
parent 4bb1c8006c
commit 76da4f89bc
5 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Phreeqc.cpp
View File

@ -978,9 +978,6 @@ void Phreeqc::init(void)
/* ----------------------------------------------------------------------
* ISOTOPES
* ---------------------------------------------------------------------- */
//count_master_isotope = 0;
//master_isotope = NULL;
//max_master_isotope = MAX_ELTS;
initial_solution_isotopes = FALSE;
calculate_value_hash_table = NULL;
count_isotope_ratio = 0;
@ -2271,12 +2268,6 @@ Phreeqc::InternalCopy(const Phreeqc *pSrc)
/* ----------------------------------------------------------------------
* ISOTOPES
* ---------------------------------------------------------------------- */
/*
count_master_isotope = 0;
master_isotope = NULL;
max_master_isotope = MAX_ELTS;
*/
for (int i = 0; i < (int)pSrc->master_isotope.size(); i++)
{
struct master_isotope *master_isotope_ptr = master_isotope_store(pSrc->master_isotope[i]->name, FALSE);

5
Phreeqc.h
View File

@ -1725,11 +1725,6 @@ protected:
/* ----------------------------------------------------------------------
* ISOTOPES
* ---------------------------------------------------------------------- */
//struct name_coef match_tokens[50];
//int count_match_tokens;
//int count_master_isotope;
//struct master_isotope **master_isotope;
//int max_master_isotope;
std::vector<master_isotope*> master_isotope;
int initial_solution_isotopes;
std::vector<struct calculate_value*> calculate_value;

8
isotopes.cpp
View File

@ -478,7 +478,6 @@ add_isotopes(cxxSolution &solution_ref)
/*
* zero out isotopes
*/
//for (i = 0; i < count_master_isotope; i++)
for (i = 0; i < (int)master_isotope.size(); i++)
{
master_isotope[i]->moles = 0;
@ -1351,13 +1350,6 @@ master_isotope_store(const char *name, int replace_if_found)
}
else
{
//n = count_master_isotope++;
///* make sure there is space in s */
//if (count_master_isotope >= max_master_isotope)
//{
// space((void **) ((void *) &master_isotope), count_master_isotope,
// &max_master_isotope, sizeof(struct master_isotope *));
//}
n = (int)master_isotope.size();
master_isotope.resize((size_t)n + 1);
/* Make new master_isotope structure */

3
mainsubs.cpp
View File

@ -98,9 +98,6 @@ initialize(void)
space((void **) ((void *) &logk), INIT, &max_logk, sizeof(struct logk *));
//space((void **) ((void *) &master_isotope), INIT, &max_master_isotope,
// sizeof(struct master_isotope *));
/*
* Create hash tables
*/

1
structures.cpp
View File

@ -318,7 +318,6 @@ clean_up(void)
count_phases = 0;
count_s = 0;
count_logk = 0;
//count_master_isotope = 0;
count_rates = 0;
count_inverse = 0;
count_save_values = 0;