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

[Thermo] Improve error message generated by Substance::set_xy

Browse source
This commit is contained in:
Ray Speth 2015-05-29 11:15:00 -04:00
parent e292caa187
commit 78f60e2d5f
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/tpx/Sub.cpp
View file

@ -10,6 +10,11 @@
using std::string; using std::string;
using namespace Cantera; using namespace Cantera;
namespace {
// these correspond to ordering withing propertyFlag::type
std::string propertySymbols[] = {"H", "S", "U", "V", "P", "T"};
}
namespace tpx namespace tpx
{ {
Substance::Substance() : Substance::Substance() :
@ -514,7 +519,15 @@ void Substance::set_xy(propertyFlag::type ifx, propertyFlag::type ify,
Set(PropertyPair::TV, t_here, v_here); Set(PropertyPair::TV, t_here, v_here);
LoopCount++; LoopCount++;
if (LoopCount > 200) { if (LoopCount > 200) {
throw TPX_Error("Substance::set_xy","no convergence"); std::string msg = "No convergence. " +
propertySymbols[ifx] + " = " + fp2str(X) + ", " +
propertySymbols[ify] + " = " + fp2str(Y);
if (t_here == Tmin()) {
msg += "\nAt temperature limit (Tmin = " + fp2str(Tmin()) + ")";
} else if (t_here == Tmax()) {
msg += "\nAt temperature limit (Tmax = " + fp2str(Tmax()) + ")";
}
throw TPX_Error("Substance::set_xy", msg);
} }
} }
} }