Fixed bug in read_gas_phase_modify, appended components already in list.

Removed #SKIP from basicsubs.cpp, gases.cpp, input.cpp.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5979 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2012-01-05 17:06:45 +00:00
parent 18eba6bd38
commit 7257281b55

View File

@ -403,7 +403,19 @@ cxxGasPhase::read_raw(CParser & parser, bool check)
} }
else else
{ {
this->gas_comps.push_back(gc); size_t i;
for (i = 0; i < this->gas_comps.size(); i++)
{
if (this->gas_comps[i].Get_phase_name() == gc.Get_phase_name())
{
this->gas_comps[i] = gc;
break;
}
}
if (i >= this->gas_comps.size())
{
this->gas_comps.push_back(gc);
}
} }
//opt_save = 4; //opt_save = 4;
useLastLine = true; useLastLine = true;