mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-16 16:44:49 +01:00
Removed echo that was always true. Made huge string that crashed
restart. Results are same without the removed lines. git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2276 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
parent
8d475282bf
commit
e7ec5c7691
@ -563,6 +563,7 @@ int CParser::get_option(const std::vector<std::string>& opt_list, std::string::i
|
|||||||
// char option[MAX_LENGTH];
|
// char option[MAX_LENGTH];
|
||||||
std::string option;
|
std::string option;
|
||||||
|
|
||||||
|
fprintf(stderr, "Did not think this get_option was called\n");
|
||||||
//
|
//
|
||||||
// Read line
|
// Read line
|
||||||
//
|
//
|
||||||
@ -689,6 +690,7 @@ int CParser::get_option(const std::vector<std::string>& opt_list, std::istream::
|
|||||||
//{{
|
//{{
|
||||||
//// m_line_iss.clear();
|
//// m_line_iss.clear();
|
||||||
//}}
|
//}}
|
||||||
|
/*
|
||||||
if (true) // pr.echo_input == TRUE
|
if (true) // pr.echo_input == TRUE
|
||||||
{
|
{
|
||||||
if (true) // database_file == NULL
|
if (true) // database_file == NULL
|
||||||
@ -696,13 +698,16 @@ int CParser::get_option(const std::vector<std::string>& opt_list, std::istream::
|
|||||||
get_output() << "\t" << m_line_save << "\n";
|
get_output() << "\t" << m_line_save << "\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
/*
|
||||||
if (true) // (database_file == NULL)
|
if (true) // (database_file == NULL)
|
||||||
{
|
{
|
||||||
get_output() << "\t" << m_line_save << "\n";
|
get_output() << "\t" << m_line_save << "\n";
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
//error_msg("Unknown option.", OT_CONTINUE);
|
//error_msg("Unknown option.", OT_CONTINUE);
|
||||||
//error_msg(m_line_save.c_str(), OT_CONTINUE);
|
//error_msg(m_line_save.c_str(), OT_CONTINUE);
|
||||||
//incr_input_error();
|
//incr_input_error();
|
||||||
@ -724,13 +729,16 @@ int CParser::get_option(const std::vector<std::string>& opt_list, std::istream::
|
|||||||
j = OPT_DEFAULT;
|
j = OPT_DEFAULT;
|
||||||
next_pos = 0;
|
next_pos = 0;
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
if (true) // pr.echo_input == TRUE
|
if (true) // pr.echo_input == TRUE
|
||||||
{
|
{
|
||||||
if (true) // database_file == NULL
|
if (true) // database_file == NULL
|
||||||
{
|
{
|
||||||
|
fprintf(stderr, "Yikes 3\n");
|
||||||
get_output() << "\t" << m_line_save << "\n";
|
get_output() << "\t" << m_line_save << "\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
return (j);
|
return (j);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user