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

Merge commit '6d2b45a8e168aa9e55ee677afe52367857e8140d'

Browse Source
This commit is contained in:
Darth Vader 2021-04-10 17:28:30 +00:00
commit 4b9b99267b
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phreeqcpp/Phreeqc.h
View File

@ -499,8 +499,8 @@ public:
// pitzer.cpp ------------------------------- // pitzer.cpp -------------------------------
class pitz_param* pitz_param_read(char* string, int n); class pitz_param* pitz_param_read(char* string, int n);
void pitz_param_store(const class pitz_param* pzp_ptr); void pitz_param_store(class pitz_param* pzp_ptr);
void sit_param_store(const class pitz_param* pzp_ptr); void sit_param_store(class pitz_param* pzp_ptr);
class pitz_param* pitz_param_copy(const class pitz_param* src); class pitz_param* pitz_param_copy(const class pitz_param* src);
class theta_param* theta_param_search(LDBLE zj, LDBLE zk); class theta_param* theta_param_search(LDBLE zj, LDBLE zk);
void pitzer_make_lists(void); void pitzer_make_lists(void);

1
phreeqcpp/class_main.cpp
View File

@ -23,6 +23,7 @@ main(int argc, char *argv[])
// check for floating point exceptions on Linux // check for floating point exceptions on Linux
// feenableexcept(FE_DIVBYZERO|FE_INVALID|FE_OVERFLOW|FE_UNDERFLOW); // feenableexcept(FE_DIVBYZERO|FE_INVALID|FE_OVERFLOW|FE_UNDERFLOW);
//#define WIN32_MEMORY_DEBUG
#if defined(WIN32_MEMORY_DEBUG) #if defined(WIN32_MEMORY_DEBUG)
int tmpDbgFlag; int tmpDbgFlag;

14
phreeqcpp/pitzer_structures.cpp
View File

@ -66,7 +66,7 @@ pitz_param_read(char *string, int n)
} }
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
void Phreeqc:: void Phreeqc::
pitz_param_store(const class pitz_param *pzp_ptr) pitz_param_store(class pitz_param *pzp_ptr)
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
{ {
/* /*
@ -78,7 +78,6 @@ pitz_param_store(const class pitz_param *pzp_ptr)
return; return;
if (pzp_ptr->type == TYPE_Other) if (pzp_ptr->type == TYPE_Other)
return; return;
class pitz_param* dest = pitz_param_copy(pzp_ptr);
std::set< std::string > header; std::set< std::string > header;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
@ -108,20 +107,20 @@ pitz_param_store(const class pitz_param *pzp_ptr)
} }
warning_msg(error_string); warning_msg(error_string);
delete pitz_params[(*jit).second]; delete pitz_params[(*jit).second];
pitz_params[(*jit).second] = dest; pitz_params[(*jit).second] = pzp_ptr;
} }
else else
{ {
size_t count_pitz_param = pitz_params.size(); size_t count_pitz_param = pitz_params.size();
pitz_params.resize(count_pitz_param + 1); pitz_params.resize(count_pitz_param + 1);
pitz_params[count_pitz_param] = pitz_param_copy(pzp_ptr); pitz_params[count_pitz_param] = pzp_ptr;
pitz_param_map[key] = count_pitz_param; pitz_param_map[key] = count_pitz_param;
} }
} }
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
void Phreeqc:: void Phreeqc::
sit_param_store(const class pitz_param *pzp_ptr) sit_param_store(class pitz_param *pzp_ptr)
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
{ {
/* /*
@ -133,7 +132,6 @@ sit_param_store(const class pitz_param *pzp_ptr)
return; return;
if (pzp_ptr->type == TYPE_Other) if (pzp_ptr->type == TYPE_Other)
return; return;
class pitz_param* dest = pitz_param_copy(pzp_ptr);
std::set< std::string > header; std::set< std::string > header;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
@ -165,13 +163,13 @@ sit_param_store(const class pitz_param *pzp_ptr)
} }
warning_msg(error_string); warning_msg(error_string);
delete sit_params[(*jit).second]; delete sit_params[(*jit).second];
sit_params[(*jit).second] = dest; sit_params[(*jit).second] = pzp_ptr;
} }
else else
{ {
size_t count_sit_param = sit_params.size(); size_t count_sit_param = sit_params.size();
sit_params.resize(count_sit_param + 1); sit_params.resize(count_sit_param + 1);
sit_params[count_sit_param] = dest; sit_params[count_sit_param] = pzp_ptr;
sit_param_map[key] = count_sit_param; sit_param_map[key] = count_sit_param;
} }
} }

1
phreeqcpp/structures.cpp
View File

@ -146,6 +146,7 @@ clean_up(void)
/* user_print and user_punch */ /* user_print and user_punch */
UserPunch_map.clear(); UserPunch_map.clear();
rate_free(user_print); rate_free(user_print);
delete user_print;
/* /*
Clear llnl aqueous model parameters Clear llnl aqueous model parameters
*/ */