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

[Thermo] Check composition strings for invalid float literals

Browse source 
Cherry-pick of trunk r2866
This commit is contained in:
Ray Speth 2014-04-29 19:02:23 +00:00
parent cc324285d2
commit a1f4d6f110
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/base/stringUtils.cpp
View file

@ -139,7 +139,7 @@ compositionMap parseCompString(const std::string& ss,
if (icolon != std::string::npos) {
std::string name = stripws(s.substr(0, icolon));
if (iend != std::string::npos) {
num = s.substr(icolon+1, iend-icolon);
num = s.substr(icolon+1, iend-icolon-1);
s = s.substr(iend+1, s.size());
} else {
num = s.substr(icolon+1, s.size());
@ -149,7 +149,7 @@ compositionMap parseCompString(const std::string& ss,
throw CanteraError("parseCompString",
"unknown species " + name);
}
x[name] = fpValue(num);
x[name] = fpValueCheck(num);
} else {
s = "";
}