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

Merge commit '5b7cf2f8f32d1df2855a34f51102876527236915'

Browse Source
This commit is contained in:
Darth Vader 2021-05-10 22:50:57 +00:00
commit cbc40fac6f
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
phreeqcpp/Phreeqc.h
View File

@ -1398,6 +1398,7 @@ protected:
*---------------------------------------------------------------------- */
std::vector<class unknown*> x;
size_t count_unknowns;
size_t sit_aqueous_unknowns;
size_t max_unknowns;
class unknown* ah2o_unknown;

4
phreeqcpp/prep.cpp
View File

@ -1240,8 +1240,7 @@ build_model(void)
}
if (dl_type_x != cxxSurface::NO_DL && (/*pitzer_model == TRUE || */sit_model == TRUE)) //DL_pitz
{
error_msg("-diffuse_layer option not available for Pizer or SIT model",
STOP);
warning_msg("-diffuse_layer option not tested for SIT model");
}
/*
* Sum diffuse layer water into hydrogen and oxygen mass balances
@ -1285,6 +1284,7 @@ build_model(void)
k++;
count_unknowns++;
}
sit_aqueous_unknowns = count_unknowns - j0;
}
/*
* Rewrite phases to current master species

3
phreeqcpp/sit.cpp
View File

@ -1117,7 +1117,8 @@ model_sit(void)
{
count_basis_change++;
count_unknowns -= (int)this->s_x.size();
//count_unknowns -= (int)this->s_x.size();
count_unknowns -= sit_aqueous_unknowns;
reprep();
full_pitzer = false;
}