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

try/catch in class_main.cpp

Browse Source 
reset rate_sim_time in reactions to avoid carryover to transport.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8920 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2014-08-06 16:42:07 +00:00
parent 4f60c8774e
commit e62cc9cba3
2 changed files with 67 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
class_main.cpp
View File

@ -188,62 +188,77 @@ main_method(int argc, char *argv[])
_CrtSetDbgFlag(tmpDbgFlag);
//_crtBreakAlloc = 9482;
#endif
phast = FALSE;
/*
* Open input/output files
*/
errors = process_file_names(argc, argv, &db_cookie, &input_cookie, TRUE);
if (errors != 0)
try
{
return errors;
}
phast = FALSE;
/*
* Open input/output files
*/
errors = process_file_names(argc, argv, &db_cookie, &input_cookie, TRUE);
if (errors != 0)
{
return errors;
}
#ifdef DOS
write_banner();
write_banner();
#endif
/*
* Initialize arrays
*/
errors = do_initialize();
if (errors != 0)
{
return errors;
/*
* Initialize arrays
*/
errors = do_initialize();
if (errors != 0)
{
return errors;
}
/*
* Load database into memory
*/
this->phrq_io->push_istream(db_cookie);
errors = read_database();
this->phrq_io->clear_istream();
if (errors != 0)
{
return errors;
}
/*
* Read input data for simulation
*/
this->phrq_io->push_istream(input_cookie);
errors = run_simulations();
//Phreeqc mycopy(*this);
this->phrq_io->clear_istream();
if (errors != 0)
{
return errors;
}
/*
* Display successful status
*/
pr.headings = TRUE;
errors = do_status();
if (errors != 0)
{
return errors;
}
}
/*
* Load database into memory
*/
this->phrq_io->push_istream(db_cookie);
errors = read_database();
this->phrq_io->clear_istream();
if (errors != 0)
catch (...)
{
return errors;
}
/*
* Read input data for simulation
*/
this->phrq_io->push_istream(input_cookie);
errors = run_simulations();
//Phreeqc mycopy(*this);
this->phrq_io->clear_istream();
if (errors != 0)
{
return errors;
}
/*
* Display successful status
*/
pr.headings = TRUE;
errors = do_status();
if (errors != 0)
{
return errors;
int e = get_input_errors();
std::cerr << "Unhandled exception in PHREEQC." << std::endl;
if (e > 0)
{
return e;
}
else
{
return 1;
}
}
return 0;
}
@ -490,7 +505,7 @@ process_file_names(int argc, char *argv[], std::istream **db_cookie,
*db_cookie = new std::ifstream(db_file, std::ios_base::in);
*input_cookie = new std::ifstream(in_file, std::ios_base::in);
}
catch (const PhreeqcStop& e)
catch (const PhreeqcStop&)
{
return get_input_errors();
}

1
mainsubs.cpp
View File

@ -1122,6 +1122,7 @@ reactions(void)
// }
// }
/* last_model.force_prep = TRUE; */
rate_sim_time = 0;
return (OK);
}