From df0127edeabf9e6b386d27627fde6af64aed6db1 Mon Sep 17 00:00:00 2001 From: Ian bell Date: Thu, 15 May 2014 22:26:22 +0200 Subject: [PATCH] Updated speed test (does it work? not sure) Signed-off-by: Ian bell --- include/SpeedTest.h | 2 +- src/SpeedTest.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/SpeedTest.h b/include/SpeedTest.h index afd76dde..b08b7246 100644 --- a/include/SpeedTest.h +++ b/include/SpeedTest.h @@ -5,7 +5,7 @@ namespace CoolProp{ -void compare_REFPROP_and_CoolProp(std::string fluid, int inputs, double val1, double val2, std::size_t N); +void compare_REFPROP_and_CoolProp(std::string fluid, int inputs, double val1, double val2, std::size_t N, double d1 = 0, double d2 = 0); } /* namespace CoolProp */ diff --git a/src/SpeedTest.cpp b/src/SpeedTest.cpp index e5022a02..c3001a23 100644 --- a/src/SpeedTest.cpp +++ b/src/SpeedTest.cpp @@ -6,7 +6,7 @@ namespace CoolProp{ -void compare_REFPROP_and_CoolProp(std::string fluid, int inputs, double val1, double val2, std::size_t N) +void compare_REFPROP_and_CoolProp(std::string fluid, int inputs, double val1, double val2, std::size_t N, double d1, double d2) { time_t t1,t2; double dx = 1/((double)N); @@ -15,7 +15,7 @@ void compare_REFPROP_and_CoolProp(std::string fluid, int inputs, double val1, do t1 = clock(); for (std::size_t ii = 0; ii < N; ++ii) { - State->update(inputs, val1+ii*dx, val2 - ii*dx); + State->update(inputs, val1 + ii*d1, val2 + ii*d2); } t2 = clock(); delete State; @@ -26,7 +26,7 @@ void compare_REFPROP_and_CoolProp(std::string fluid, int inputs, double val1, do t1 = clock(); for (std::size_t ii = 0; ii < N; ++ii) { - State->update(inputs, val1+ii*dx, val2 - ii*dx); + State->update(inputs, val1 + ii*d1, val2 + ii*d2); } t2 = clock(); delete State;