still issues with #413

This commit is contained in:
Jorrit Wronski
2015-01-20 12:32:14 +01:00
parent 104175dfa1
commit 2a325ab6e6

View File

@@ -23,12 +23,11 @@ void IncompressibleFluid::set_reference_state(double T0, double p0, double x0, d
this->rhoref = rho(T0,p0,x0);
this->pref = p0;
this->href = h0;
this->sref = s0;
// Now we take care of the energy related values
this->uref = 0.0;
this->uref = u(T0,p0,x0) - h0; // (value without ref) - (desired ref)
//this->sref = 0.0;
//this->sref = s(T0,p0,x0) - s0; // (value without ref) - (desired ref)
this->sref = 0.0;
this->sref = s(T0,p0,x0) - s0; // (value without ref) - (desired ref)
}
void IncompressibleFluid::validate(){
@@ -665,8 +664,20 @@ TEST_CASE("Internal consistency checks and example use cases for the incompressi
// Compare reference state
{
res = XLT.h(Tref,pref,xref);
CAPTURE(Tref);
CAPTURE(pref);
CAPTURE(xref);
CAPTURE(href)
CAPTURE(res)
CHECK( check_abs(href,res,acc) );
}
{
res = XLT.s(Tref,pref,xref);
CAPTURE(Tref);
CAPTURE(pref);
CAPTURE(xref);
CAPTURE(sref)
CAPTURE(res)
CHECK( check_abs(sref,res,acc) );
}