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

cleaning up bugs with exchange

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5978 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2012-01-05 16:36:31 +00:00
parent 90934690e3
commit 18eba6bd38
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Exchange.cxx
View File

@ -437,6 +437,7 @@ cxxExchange::Get_exchComps(void)
{
return (this->exchComps);
}
const cxxNameDouble &
cxxExchange::Get_totals() const
{

4
GasPhase.cxx
View File

@ -30,6 +30,7 @@ cxxGasPhase::cxxGasPhase(PHRQ_io * io)
n_solution = -999;
type = cxxGasPhase::GP_PRESSURE;
total_p = 1.0;
total_moles = 0.0;
volume = 1.0;
v_m = 0;
pr_in = false;
@ -310,7 +311,10 @@ cxxGasPhase::read_raw(CParser & parser, bool check)
}
else
{
CParser::ECHO_OPTION eo = parser.get_echo_file();
parser.set_echo_file(CParser::EO_NONE);
opt = parser.getOptionFromLastLine(vopts, next_char);
parser.set_echo_file(eo);
}
if (opt == CParser::OPT_DEFAULT)
{

2
Parser.cxx
View File

@ -1245,7 +1245,7 @@ CParser::getOptionFromLastLine(const std::vector < std::string > &opt_list,
pos_ptr = 0;
copy_token(option, pos_ptr);
next_pos = pos_ptr;
if (true) // pr.echo_input == TRUE
if (this->echo_file) // pr.echo_input == TRUE
{
if (true) // database_file == NULL
{