github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-01-30 08:18:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Flush error message in Props1SI if first call is backwards but second is good

Browse Source 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
This commit is contained in:
Ian Bell
2014-10-14 15:22:38 +02:00
parent 441d448198
commit c50ca39238
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/CoolProp.cpp
View File

@@ -445,9 +445,15 @@ double Props1SI(const std::string &FluidName, const std::string &Output)
std::string _FluidName = FluidName, empty_string = "", _Output = Output;
double val1 = PropsSI(_FluidName, empty_string, 0, empty_string, 0, _Output);
if (!ValidNumber(val1)){
// flush the error
set_error_string("");
// Try with them flipped
val1 = PropsSI(_Output, empty_string, 0, empty_string, 0, _FluidName);
}
if (!ValidNumber(val1)){
set_error_string(format("Unable to use inputs %s,%s in Props1SI (order doesn't matter)"));
return _HUGE;
}
return val1;
}
double PropsSI(const std::string &Output, const std::string &Name1, double Prop1, const std::string &Name2, double Prop2, const std::string &Ref)
@@ -972,7 +978,7 @@ std::string PhaseSI(const std::string &Name1, double Prop1, const std::string &N
{
double Phase_double = PropsSI("Phase",Name1,Prop1,Name2,Prop2,FluidName);
if (!ValidNumber(Phase_double)){ return "";}
std::size_t Phase_int = static_cast<std::size_t>(round(Phase_double));
std::size_t Phase_int = static_cast<std::size_t>(Phase_double);
return phase_lookup_string(static_cast<phases>(Phase_int));
}
@@ -980,7 +986,7 @@ std::string PhaseSI(const std::string &Name1, double Prop1, const std::string &N
{
double Phase_double = PropsSI("Phase",Name1,Prop1,Name2,Prop2,FluidName,z);
if (!ValidNumber(Phase_double)){ return "";}
std::size_t Phase_int = static_cast<std::size_t>(round(Phase_double));
std::size_t Phase_int = static_cast<std::size_t>(Phase_double);
return phase_lookup_string(static_cast<phases>(Phase_int));
}