From c40ed3ece68c5e8a4f77068287a2d4823021d9c8 Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Wed, 17 Feb 2016 22:01:52 +0100 Subject: [PATCH] Using template for cmp::vector_equal() --- opm/core/simulator/BlackoilState.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/opm/core/simulator/BlackoilState.cpp b/opm/core/simulator/BlackoilState.cpp index b9249db09..46b9d3a50 100644 --- a/opm/core/simulator/BlackoilState.cpp +++ b/opm/core/simulator/BlackoilState.cpp @@ -40,19 +40,19 @@ BlackoilState::equals(const SimulatorState& other, const BlackoilState* that = dynamic_cast (&other); bool equal = that != 0; equal = equal && SimulatorState::equals (other, epsilon); - equal = equal && cmp::double_vector_equal(this->surfacevol(), - that->surfacevol(), - cmp::default_abs_epsilon, - epsilon); + equal = equal && cmp::vector_equal(this->surfacevol(), + that->surfacevol(), + cmp::default_abs_epsilon, + epsilon); - equal = equal && cmp::double_vector_equal(this->gasoilratio(), - that->gasoilratio(), - cmp::default_abs_epsilon, - epsilon); + equal = equal && cmp::vector_equal(this->gasoilratio(), + that->gasoilratio(), + cmp::default_abs_epsilon, + epsilon); - equal = equal && cmp::double_vector_equal(this->rv(), - that->rv(), - cmp::default_abs_epsilon, - epsilon); + equal = equal && cmp::vector_equal(this->rv(), + that->rv(), + cmp::default_abs_epsilon, + epsilon); return equal; }