Using template for cmp::vector_equal()

This commit is contained in:
Joakim Hove 2016-02-17 22:01:52 +01:00
parent 6f3c4fb618
commit c40ed3ece6

View File

@ -40,17 +40,17 @@ BlackoilState::equals(const SimulatorState& other,
const BlackoilState* that = dynamic_cast <const BlackoilState*> (&other); const BlackoilState* that = dynamic_cast <const BlackoilState*> (&other);
bool equal = that != 0; bool equal = that != 0;
equal = equal && SimulatorState::equals (other, epsilon); equal = equal && SimulatorState::equals (other, epsilon);
equal = equal && cmp::double_vector_equal(this->surfacevol(), equal = equal && cmp::vector_equal(this->surfacevol(),
that->surfacevol(), that->surfacevol(),
cmp::default_abs_epsilon, cmp::default_abs_epsilon,
epsilon); epsilon);
equal = equal && cmp::double_vector_equal(this->gasoilratio(), equal = equal && cmp::vector_equal(this->gasoilratio(),
that->gasoilratio(), that->gasoilratio(),
cmp::default_abs_epsilon, cmp::default_abs_epsilon,
epsilon); epsilon);
equal = equal && cmp::double_vector_equal(this->rv(), equal = equal && cmp::vector_equal(this->rv(),
that->rv(), that->rv(),
cmp::default_abs_epsilon, cmp::default_abs_epsilon,
epsilon); epsilon);