ECS conductivity work - nearly works, just need to sort out the conformal state solver.

Goodbye to AbstractStateWrapper - can use std::tr1::shared_ptr, much nicer

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
This commit is contained in:
Ian Bell
2014-05-28 19:15:34 +02:00
parent 118d7e9ad2
commit f93aa76210
11 changed files with 287 additions and 159 deletions

View File

@@ -332,28 +332,7 @@ TEST_CASE("Check AbstractState","[AbstractState]")
{
SECTION("bad backend")
{
CoolProp::AbstractStateWrapper Water;
CHECK_THROWS(Water.set("DEFINITELY_A_BAD_BACKEND", "Water"));
}
}
TEST_CASE("Check AbstractStateWrapper","[AbstractStateWrapper]")
{
SECTION("empty on init")
{
CoolProp::AbstractStateWrapper Water;
CHECK_NOTHROW(Water.empty());
CHECK(Water.empty() == true);
CHECK_THROWS(Water.update(CoolProp::QT_INPUTS,1,300));
}
SECTION("initialized")
{
CoolProp::AbstractStateWrapper Water;
CHECK_NOTHROW(Water.empty());
CHECK(Water.empty() == true);
Water.set("HEOS", "Water");
CHECK(Water.empty() == false);
CHECK_NOTHROW(Water.update(CoolProp::QT_INPUTS,1,300));
CHECK_THROWS(std::tr1::shared_ptr<CoolProp::AbstractState> Water(CoolProp::AbstractState::factory("DEFINITELY_A_BAD_BACKEND", "Water")));
}
}