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

Merge commit 'd6e6d11b2868f770f394fd7f2635ddaaed6598df'

Browse Source
This commit is contained in:
Darth Vader 2021-03-14 02:14:30 +00:00
commit 50e81af4ec
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
phreeqcpp/Exchange.cxx
View File

@ -39,6 +39,7 @@ cxxNumKeyword(io)
this->pitzer_exchange_gammas = true; this->pitzer_exchange_gammas = true;
this->new_def = false; this->new_def = false;
this->n_solution = -999; this->n_solution = -999;
this->solution_equilibria = false;
// //
// Mix exchangers // Mix exchangers
// //

7
phreeqcpp/GasPhase.cxx
View File

@ -128,6 +128,13 @@ cxxGasPhase::cxxGasPhase(std::map < int, cxxGasPhase > &entity_map,
v_m = 0; v_m = 0;
pr_in = false; pr_in = false;
bool first = true; bool first = true;
new_def = false;
solution_equilibria = false;
n_solution = -999;
type = cxxGasPhase::GP_PRESSURE;
total_moles = 0.0;
temperature = 298.15;
// //
// Mix // Mix
// //

1
phreeqcpp/PPassemblage.cxx
View File

@ -35,6 +35,7 @@ cxxNumKeyword(io)
{ {
this->n_user = this->n_user_end = l_n_user; this->n_user = this->n_user_end = l_n_user;
eltList.type = cxxNameDouble::ND_ELT_MOLES; eltList.type = cxxNameDouble::ND_ELT_MOLES;
this->new_def = false;
// //
// Mix // Mix
// //

8
phreeqcpp/model.cpp
View File

@ -887,7 +887,8 @@ int Phreeqc::gammas_a_f(int i1)
int i, j; int i, j;
//LDBLE d2, d3, coef = 0, sum = 0; //LDBLE d2, d3, coef = 0, sum = 0;
LDBLE d2, d3, sum = 0; LDBLE d2, d3, sum = 0;
char name[MAX_LENGTH]; //char name[MAX_LENGTH];
std::string name;
//struct master *m_ptr; //struct master *m_ptr;
i = i1; i = i1;
@ -895,7 +896,8 @@ int Phreeqc::gammas_a_f(int i1)
{ {
if (s_x[i]->rxn_x->token[j].s->type == EX) if (s_x[i]->rxn_x->token[j].s->type == EX)
{ {
strcpy(name, s_x[i]->rxn_x->token[j].s->name); //strcpy(name, s_x[i]->rxn_x->token[j].s->name);
name = s_x[i]->rxn_x->token[j].s->name;
//m_ptr = s_x[i]->rxn_x->token[j].s->primary->elt->master; // appt debug //m_ptr = s_x[i]->rxn_x->token[j].s->primary->elt->master; // appt debug
break; break;
} }
@ -909,7 +911,7 @@ int Phreeqc::gammas_a_f(int i1)
{ {
if (s_x[i]->rxn_x->token[j].s->type == EX) if (s_x[i]->rxn_x->token[j].s->type == EX)
{ {
if (!strcmp(name, s_x[i]->rxn_x->token[j].s->name)) if (!strcmp(name.c_str(), s_x[i]->rxn_x->token[j].s->name))
sum += s_x[i]->moles * s_x[i]->equiv; sum += s_x[i]->moles * s_x[i]->equiv;
break; break;
} }