research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed indexing errors in Phase::addUniqueSpecies

Browse source 
Also simplified to eliminate unnecessary iterator usage and fixed a comment that
indicated exactly the opposite of what the function actually does.
This commit is contained in:
Ray Speth 2012-07-18 18:32:17 +00:00
parent 7bbadb8063
commit e77990ab24
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/thermo/Phase.cpp
View file

@ -893,32 +893,28 @@ void Phase::addSpecies(const std::string& name, const doublereal* comp,
void Phase::addUniqueSpecies(const std::string& name, const doublereal* comp,
doublereal charge, doublereal size)
{
vector<string>::const_iterator it = m_speciesNames.begin();
for (size_t k = 0; k < m_kk; k++) {
if (*it == name) {
// We have found a match. At this point we could do some
// compatibility checks. However, let's just return for the moment
// without specifying any error.
if (m_speciesNames[k] == name) {
// We have found a match. Do some compatibility checks.
for (size_t i = 0; i < m_mm; i++) {
if (comp[i] != m_speciesComp[m_kk * m_mm + i]) {
if (comp[i] != m_speciesComp[k * m_mm + i]) {
throw CanteraError("addUniqueSpecies",
"Duplicate species have different "
"compositions: " + *it);
"compositions: " + name);
}
}
if (charge != m_speciesCharge[m_kk]) {
if (charge != m_speciesCharge[k]) {
throw CanteraError("addUniqueSpecies",
"Duplicate species have different "
"charges: " + *it);
"charges: " + name);
}
if (size != m_speciesSize[m_kk]) {
if (size != m_speciesSize[k]) {
throw CanteraError("addUniqueSpecies",
"Duplicate species have different "
"sizes: " + *it);
"sizes: " + name);
}
return;
}
++it;
}
addSpecies(name, comp, charge, size);
}