github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-04-23 03:00:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

cleaned up whitespace

Browse Source
This commit is contained in:
Ian Bell
2014-08-09 15:12:31 +02:00
parent c3cc696080
commit 5ee295f639
1 changed files with 141 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

282
src/Tests/CoolProp-Tests.cpp
View File

@@ -610,8 +610,8 @@ TEST_CASE("Test saturation properties for a few fluids", "[saturation],[slow]")
SECTION("sat_p")
{
std::vector<double> pv = linspace(Props1SI("CO2", "ptriple"), Props1SI("CO2", "pcrit")-1e-6,5);
SECTION("All pressures are ok" )
SECTION("All pressures are ok" )
for (std::size_t i = 0; i < pv.size(); ++i)
{
CAPTURE(pv[i]);
@@ -622,120 +622,120 @@ TEST_CASE("Test saturation properties for a few fluids", "[saturation],[slow]")
TEST_CASE("Tests for solvers in P,T flash using Water", "[flash],[PT]")
{
SECTION("Check that T,P for saturated state yields error")
{
double Ts, ps, rho;
CHECK_NOTHROW(Ts = PropsSI("T","P",101325,"Q",0,"Water"));
CHECK(ValidNumber(Ts));
CAPTURE(Ts);
CHECK_NOTHROW(rho = PropsSI("D","T",Ts,"P",101325,"Water"));
CAPTURE(rho);
CHECK(!ValidNumber(rho));
}
SECTION("Subcritical p slightly subcooled should be ok")
{
double Ts, ps, rho, dT = 1e-8;
CHECK_NOTHROW(Ts = PropsSI("T","P",101325,"Q",0,"Water"));
CAPTURE(Ts);
CHECK(ValidNumber(Ts));
CAPTURE(dT);
CHECK_NOTHROW(rho = PropsSI("D","T",Ts-dT,"P",101325,"Water"));
CAPTURE(rho);
CHECK(ValidNumber(rho));
}
SECTION("Subcritical p slightly superheated should be ok")
{
double Ts, ps, rho, dT = 1e-8;
CHECK_NOTHROW(Ts = PropsSI("T","P",101325,"Q",0,"Water"));
CAPTURE(Ts);
CHECK(ValidNumber(Ts));
CAPTURE(dT);
CHECK_NOTHROW(rho = PropsSI("D","T",Ts+dT,"P",101325,"Water"));
CAPTURE(rho);
CHECK(ValidNumber(rho));
}
SECTION("Check that T,P for saturated state yields error")
{
double Ts, ps, rho;
CHECK_NOTHROW(Ts = PropsSI("T","P",101325,"Q",0,"Water"));
CHECK(ValidNumber(Ts));
CAPTURE(Ts);
CHECK_NOTHROW(rho = PropsSI("D","T",Ts,"P",101325,"Water"));
CAPTURE(rho);
CHECK(!ValidNumber(rho));
}
SECTION("Subcritical p slightly subcooled should be ok")
{
double Ts, ps, rho, dT = 1e-8;
CHECK_NOTHROW(Ts = PropsSI("T","P",101325,"Q",0,"Water"));
CAPTURE(Ts);
CHECK(ValidNumber(Ts));
CAPTURE(dT);
CHECK_NOTHROW(rho = PropsSI("D","T",Ts-dT,"P",101325,"Water"));
CAPTURE(rho);
CHECK(ValidNumber(rho));
}
SECTION("Subcritical p slightly superheated should be ok")
{
double Ts, ps, rho, dT = 1e-8;
CHECK_NOTHROW(Ts = PropsSI("T","P",101325,"Q",0,"Water"));
CAPTURE(Ts);
CHECK(ValidNumber(Ts));
CAPTURE(dT);
CHECK_NOTHROW(rho = PropsSI("D","T",Ts+dT,"P",101325,"Water"));
CAPTURE(rho);
CHECK(ValidNumber(rho));
}
}
TEST_CASE("Tests for solvers in P,Y flash using Water", "[flash],[PH],[PS],[PU]")
{
double Ts, y, T2;
// See https://groups.google.com/forum/?fromgroups#!topic/catch-forum/mRBKqtTrITU
std::string Ykeys[] = {"H","S","U","Hmass","Smass","Umass","Hmolar","Smolar","Umolar"};
for (int i = 0; i < 9; ++i) {
const char *ykey = Ykeys[i].c_str();
std::ostringstream ss1;
ss1 << "Subcritical superheated P," << ykey;
SECTION(ss1.str(),"")
{
double dT = 10;
CHECK_NOTHROW(Ts=PropsSI("T","P",101325,"Q",0,"Water"));
CHECK(ValidNumber(Ts));
CAPTURE(Ts);
CHECK_NOTHROW(y=PropsSI(ykey,"T",Ts+dT,"P",101325,"Water"));
CAPTURE(dT);
CAPTURE(y);
CHECK(ValidNumber(y));
CHECK_NOTHROW(T2=PropsSI("T",ykey,y,"P",101325,"Water"));
CAPTURE(CoolProp::get_global_param_string("errstring"));
CAPTURE(T2);
CHECK(ValidNumber(T2));
}
std::ostringstream ss2;
ss2 << "Subcritical barely superheated P," << ykey;
SECTION(ss2.str(), "")
{
double dT = 1e-6;
CHECK_NOTHROW(Ts=PropsSI("T","P",101325,"Q",0,"Water"));
CHECK(ValidNumber(Ts));
CAPTURE(Ts);
CHECK_NOTHROW(y=PropsSI(ykey,"T",Ts+dT,"P",101325,"Water"));
CAPTURE(dT);
CAPTURE(y);
CHECK(ValidNumber(y));
CHECK_NOTHROW(T2=PropsSI("T",ykey,y,"P",101325,"Water"));
CAPTURE(CoolProp::get_global_param_string("errstring"));
CAPTURE(T2);
CHECK(ValidNumber(T2));
}
std::ostringstream ss3;
ss3 << "Subcritical subcooled P," << ykey;
SECTION(ss3.str(), "")
{
double dT = -10;
CHECK_NOTHROW(Ts=PropsSI("T","P",101325,"Q",0,"Water"));
CHECK(ValidNumber(Ts));
CAPTURE(Ts);
CHECK_NOTHROW(y=PropsSI(ykey,"T",Ts+dT,"P",101325,"Water"));
CAPTURE(dT);
CAPTURE(y);
CHECK(ValidNumber(y));
CHECK_NOTHROW(T2=PropsSI("T",ykey,y,"P",101325,"Water"));
CAPTURE(CoolProp::get_global_param_string("errstring"));
CAPTURE(T2);
CHECK(ValidNumber(T2));
}
std::ostringstream ss4;
ss4 << "Subcritical barely subcooled P," << ykey;
SECTION(ss4.str(), "")
{
double dT = -1e-6;
CHECK_NOTHROW(Ts=PropsSI("T","P",101325,"Q",0,"Water"));
CHECK(ValidNumber(Ts));
CAPTURE(Ts);
CHECK_NOTHROW(y=PropsSI(ykey,"T",Ts+dT,"P",101325,"Water"));
CAPTURE(dT);
CAPTURE(y);
CHECK(ValidNumber(y));
CHECK_NOTHROW(T2=PropsSI("T",ykey,y,"P",101325,"Water"));
CAPTURE(CoolProp::get_global_param_string("errstring"));
CAPTURE(T2);
CHECK(ValidNumber(T2));
}
double Ts, y, T2;
// See https://groups.google.com/forum/?fromgroups#!topic/catch-forum/mRBKqtTrITU
std::string Ykeys[] = {"H","S","U","Hmass","Smass","Umass","Hmolar","Smolar","Umolar"};
for (int i = 0; i < 9; ++i) {
const char *ykey = Ykeys[i].c_str();
std::ostringstream ss1;
ss1 << "Subcritical superheated P," << ykey;
SECTION(ss1.str(),"")
{
double dT = 10;
CHECK_NOTHROW(Ts=PropsSI("T","P",101325,"Q",0,"Water"));
CHECK(ValidNumber(Ts));
CAPTURE(Ts);
CHECK_NOTHROW(y=PropsSI(ykey,"T",Ts+dT,"P",101325,"Water"));
CAPTURE(dT);
CAPTURE(y);
CHECK(ValidNumber(y));
CHECK_NOTHROW(T2=PropsSI("T",ykey,y,"P",101325,"Water"));
CAPTURE(CoolProp::get_global_param_string("errstring"));
CAPTURE(T2);
CHECK(ValidNumber(T2));
}
std::ostringstream ss2;
ss2 << "Subcritical barely superheated P," << ykey;
SECTION(ss2.str(), "")
{
double dT = 1e-6;
CHECK_NOTHROW(Ts=PropsSI("T","P",101325,"Q",0,"Water"));
CHECK(ValidNumber(Ts));
CAPTURE(Ts);
CHECK_NOTHROW(y=PropsSI(ykey,"T",Ts+dT,"P",101325,"Water"));
CAPTURE(dT);
CAPTURE(y);
CHECK(ValidNumber(y));
CHECK_NOTHROW(T2=PropsSI("T",ykey,y,"P",101325,"Water"));
CAPTURE(CoolProp::get_global_param_string("errstring"));
CAPTURE(T2);
CHECK(ValidNumber(T2));
}
std::ostringstream ss3;
ss3 << "Subcritical subcooled P," << ykey;
SECTION(ss3.str(), "")
{
double dT = -10;
CHECK_NOTHROW(Ts=PropsSI("T","P",101325,"Q",0,"Water"));
CHECK(ValidNumber(Ts));
CAPTURE(Ts);
CHECK_NOTHROW(y=PropsSI(ykey,"T",Ts+dT,"P",101325,"Water"));
CAPTURE(dT);
CAPTURE(y);
CHECK(ValidNumber(y));
CHECK_NOTHROW(T2=PropsSI("T",ykey,y,"P",101325,"Water"));
CAPTURE(CoolProp::get_global_param_string("errstring"));
CAPTURE(T2);
CHECK(ValidNumber(T2));
}
std::ostringstream ss4;
ss4 << "Subcritical barely subcooled P," << ykey;
SECTION(ss4.str(), "")
{
double dT = -1e-6;
CHECK_NOTHROW(Ts=PropsSI("T","P",101325,"Q",0,"Water"));
CHECK(ValidNumber(Ts));
CAPTURE(Ts);
CHECK_NOTHROW(y=PropsSI(ykey,"T",Ts+dT,"P",101325,"Water"));
CAPTURE(dT);
CAPTURE(y);
CHECK(ValidNumber(y));
CHECK_NOTHROW(T2=PropsSI("T",ykey,y,"P",101325,"Water"));
CAPTURE(CoolProp::get_global_param_string("errstring"));
CAPTURE(T2);
CHECK(ValidNumber(T2));
}
std::ostringstream ss5;
ss5 << "Supercritical P," << ykey;
SECTION(ss5.str(), "")
{
ss5 << "Supercritical P," << ykey;
SECTION(ss5.str(), "")
{
double Tc = Props1SI("Water","Tcrit");
double pc = Props1SI("Water","pcrit");
double p = pc*1.3;
@@ -744,18 +744,18 @@ TEST_CASE("Tests for solvers in P,Y flash using Water", "[flash],[PH],[PS],[PU]"
CAPTURE(p);
CHECK(ValidNumber(T));
CHECK(ValidNumber(p));
CHECK_NOTHROW(y=PropsSI(ykey,"P",p,"T",T,"Water"));
CAPTURE(y);
CHECK(ValidNumber(y));
CHECK_NOTHROW(T2=PropsSI("T",ykey,y,"P",p,"Water"));
CAPTURE(CoolProp::get_global_param_string("errstring"));
CAPTURE(T2);
CHECK(ValidNumber(T2));
}
CHECK_NOTHROW(y=PropsSI(ykey,"P",p,"T",T,"Water"));
CAPTURE(y);
CHECK(ValidNumber(y));
CHECK_NOTHROW(T2=PropsSI("T",ykey,y,"P",p,"Water"));
CAPTURE(CoolProp::get_global_param_string("errstring"));
CAPTURE(T2);
CHECK(ValidNumber(T2));
}
std::ostringstream ss6;
ss6 << "Supercritical \"gas\" P," << ykey;
SECTION(ss6.str(), "")
{
ss6 << "Supercritical \"gas\" P," << ykey;
SECTION(ss6.str(), "")
{
double Tc = Props1SI("Water","Tcrit");
double pc = Props1SI("Water","pcrit");
double p = pc*0.7;
@@ -764,18 +764,18 @@ TEST_CASE("Tests for solvers in P,Y flash using Water", "[flash],[PH],[PS],[PU]"
CAPTURE(p);
CHECK(ValidNumber(T));
CHECK(ValidNumber(p));
CHECK_NOTHROW(y=PropsSI(ykey,"P",p,"T",T,"Water"));
CAPTURE(y);
CHECK(ValidNumber(y));
CHECK_NOTHROW(T2=PropsSI("T",ykey,y,"P",p,"Water"));
CAPTURE(CoolProp::get_global_param_string("errstring"));
CAPTURE(T2);
CHECK(ValidNumber(T2));
}
CHECK_NOTHROW(y=PropsSI(ykey,"P",p,"T",T,"Water"));
CAPTURE(y);
CHECK(ValidNumber(y));
CHECK_NOTHROW(T2=PropsSI("T",ykey,y,"P",p,"Water"));
CAPTURE(CoolProp::get_global_param_string("errstring"));
CAPTURE(T2);
CHECK(ValidNumber(T2));
}
std::ostringstream ss7;
ss7 << "Supercritical \"liquid\" P," << ykey;
SECTION(ss7.str(), "")
{
ss7 << "Supercritical \"liquid\" P," << ykey;
SECTION(ss7.str(), "")
{
double Tc = Props1SI("Water","Tcrit");
double pc = Props1SI("Water","pcrit");
double p = pc*1.3;
@@ -784,14 +784,14 @@ TEST_CASE("Tests for solvers in P,Y flash using Water", "[flash],[PH],[PS],[PU]"
CAPTURE(p);
CHECK(ValidNumber(T));
CHECK(ValidNumber(p));
CHECK_NOTHROW(y=PropsSI(ykey,"P",p,"T",T,"Water"));
CAPTURE(y);
CHECK(ValidNumber(y));
CHECK_NOTHROW(T2=PropsSI("T",ykey,y,"P",p,"Water"));
CAPTURE(CoolProp::get_global_param_string("errstring"));
CAPTURE(T2);
CHECK(ValidNumber(T2));
}
CHECK_NOTHROW(y=PropsSI(ykey,"P",p,"T",T,"Water"));
CAPTURE(y);
CHECK(ValidNumber(y));
CHECK_NOTHROW(T2=PropsSI("T",ykey,y,"P",p,"Water"));
CAPTURE(CoolProp::get_global_param_string("errstring"));
CAPTURE(T2);
CHECK(ValidNumber(T2));
}
}