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 '548aead510d42fd3998eb74be8a5f94396c69bea'

Browse Source
This commit is contained in:
Scott R Charlton 2019-01-29 11:10:59 -07:00
commit d157977bcd
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phreeqcpp/kinetics.cpp
View File

@ -1321,7 +1321,7 @@ set_and_run_wrapper(int i, int use_mix, int use_kinetics, int nsaver,
max_try = (max_tries < max_try) ? max_tries : max_try;
/*max_try = 1; */
//restart:
restart:
for (j = 0; j < max_try; j++)
{
if (j == 1)
@ -1511,8 +1511,7 @@ set_and_run_wrapper(int i, int use_mix, int use_kinetics, int nsaver,
}
if (j == 14)
{
continue;
/*
//continue;
cxxStorageBin error_bin;
Use2cxxStorageBin(error_bin);
std::ostringstream error_input;
@ -1521,6 +1520,7 @@ set_and_run_wrapper(int i, int use_mix, int use_kinetics, int nsaver,
std::istringstream is(error_input.str());
CParser cp(is);
cp.set_echo_stream(CParser::EO_NONE);
cp.set_echo_file(CParser::EO_NONE);
reread.read_raw(cp);
cxxStorageBin2phreeqc(reread);
error_string = sformatf("Trying restarting ...\n");
@ -1533,7 +1533,6 @@ set_and_run_wrapper(int i, int use_mix, int use_kinetics, int nsaver,
restart++;
goto restart;
}
*/
}
set_and_run_attempt = j;