From 2a325ab6e697bec95b0d4994e90b9e04d1408725 Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Tue, 20 Jan 2015 12:32:14 +0100 Subject: [PATCH] still issues with #413 --- .../Incompressible/IncompressibleFluid.cpp | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/Backends/Incompressible/IncompressibleFluid.cpp b/src/Backends/Incompressible/IncompressibleFluid.cpp index 69c7754d..f0d7cb7b 100644 --- a/src/Backends/Incompressible/IncompressibleFluid.cpp +++ b/src/Backends/Incompressible/IncompressibleFluid.cpp @@ -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) ); }