From e4668088b167e8aef5876ac1f5af2c6c4f28a830 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Wed, 10 Sep 2008 15:13:23 +0000 Subject: [PATCH] Changes to the interface --- test_problems/cathermo/testIAPWSPres/testPress.cpp | 3 ++- .../cathermo/testIAPWSTripP/testTripleP.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/test_problems/cathermo/testIAPWSPres/testPress.cpp b/test_problems/cathermo/testIAPWSPres/testPress.cpp index a02fe16b4..00aabcb1e 100644 --- a/test_problems/cathermo/testIAPWSPres/testPress.cpp +++ b/test_problems/cathermo/testIAPWSPres/testPress.cpp @@ -25,7 +25,8 @@ int main () { double T = 273.15 + 100.; double rho = 10125. * 18.01 / (8.314472E3 * T); - double pres = water->pressure(T, rho); + water->setState_TR(T, rho); + double pres = water->pressure(); printf("pres = %g\n", pres); /* diff --git a/test_problems/cathermo/testIAPWSTripP/testTripleP.cpp b/test_problems/cathermo/testIAPWSTripP/testTripleP.cpp index d2826f1cd..133afb604 100644 --- a/test_problems/cathermo/testIAPWSTripP/testTripleP.cpp +++ b/test_problems/cathermo/testIAPWSTripP/testTripleP.cpp @@ -40,14 +40,14 @@ int main () { printf("h (liquid) = %g J/kmol\n", h); printf("h (liquid) = %g J/kg\n", (h)/18.015268); - double g_liq = water->Gibbs(T, dens); + double g_liq = water->Gibbs(); printf("g (liquid) = %g J/kmol\n", g_liq); - cv = water->cv(T, dens); + cv = water->cv(); printf("cv (liquid) = %g J/kmolK\n", cv); - cp = water->cp(T, dens); + cp = water->cp(); printf("cp (liquid) = %g J/kmolK\n", cp); @@ -65,14 +65,14 @@ int main () { printf("h (gas) = %g J/kmol\n", h); printf("h (gas) = %g J/kg\n", (h)/18.015268); - double g_gas = water->Gibbs(T, dens); + double g_gas = water->Gibbs(); printf("g (gas) = %g J/kmol\n", g_gas); - cv = water->cv(T, dens); + cv = water->cv(); printf("cv (gas) = %g J/kmolK\n", cv); - cp = water->cp(T, dens); + cp = water->cp(); printf("cp (gas) = %g J/kmolK\n", cp); printf("\n");