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

Needed to turn of echo when rereading components.

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3743 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2009-11-03 19:41:47 +00:00
parent ff19c86d65
commit 5de5c6f307
5 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Exchange.cxx
View File

@ -387,6 +387,8 @@ cxxExchange::read_raw(CParser & parser, bool check)
parser.set_accumulate(false);
std::istringstream is(parser.get_accumulated());
CParser reread(is);
reread.set_echo_file(CParser::EO_NONE);
reread.set_echo_stream(CParser::EO_NONE);
if (this->exchComps.find(ec.get_formula()) != this->exchComps.end())
{
cxxExchComp & comp = this->exchComps.find(ec.get_formula())->second;

3
PPassemblage.cxx
View File

@ -265,7 +265,8 @@ cxxPPassemblage::read_raw(CParser & parser, bool check)
parser.set_accumulate(false);
std::istringstream is(parser.get_accumulated());
CParser reread(is);
reread.set_echo_file(CParser::EO_NONE);
reread.set_echo_stream(CParser::EO_NONE);
if (this->ppAssemblageComps.find(ec.get_name()) != this->ppAssemblageComps.end())
{
cxxPPassemblageComp & comp = this->ppAssemblageComps.find(ec.get_name())->second;

2
SSassemblage.cxx
View File

@ -238,6 +238,8 @@ cxxSSassemblage::read_raw(CParser & parser, bool check)
parser.set_accumulate(false);
std::istringstream is(parser.get_accumulated());
CParser reread(is);
reread.set_echo_file(CParser::EO_NONE);
reread.set_echo_stream(CParser::EO_NONE);
if (this->ssAssemblageSSs.find(ec.get_name()) != this->ssAssemblageSSs.end())
{
cxxSSassemblageSS & ec1 = this->ssAssemblageSSs.find(ec.get_name())->second;

4
Surface.cxx
View File

@ -540,6 +540,8 @@ cxxSurface::read_raw(CParser & parser, bool check)
parser.set_accumulate(false);
std::istringstream is(parser.get_accumulated());
CParser reread(is);
reread.set_echo_file(CParser::EO_NONE);
reread.set_echo_stream(CParser::EO_NONE);
if (this->surfaceComps.find(ec.get_formula()) != this->surfaceComps.end())
{
cxxSurfaceComp & comp = this->surfaceComps.find(ec.get_formula())->second;
@ -591,6 +593,8 @@ cxxSurface::read_raw(CParser & parser, bool check)
parser.set_accumulate(false);
std::istringstream is(parser.get_accumulated());
CParser reread(is);
reread.set_echo_file(CParser::EO_NONE);
reread.set_echo_stream(CParser::EO_NONE);
if (this->surfaceCharges.find(ec.get_name()) != this->surfaceCharges.end())
{
cxxSurfaceCharge & comp = this->surfaceCharges.find(ec.get_name())->second;

2
cxxKinetics.cxx
View File

@ -411,6 +411,8 @@ cxxKinetics::read_raw(CParser & parser, bool check)
parser.set_accumulate(false);
std::istringstream is(parser.get_accumulated());
CParser reread(is);
reread.set_echo_file(CParser::EO_NONE);
reread.set_echo_stream(CParser::EO_NONE);
if (this->kineticsComps.find(ec.get_rate_name()) != this->kineticsComps.end())
{