From d945dee95b3afb791145a1dcd51adcf222f02b12 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Tue, 10 Mar 2020 09:55:46 +0100 Subject: [PATCH] simplify the OilVaporization equality operator in particular the UNDEF -> false condition causes issues in user code. --- .../Schedule/OilVaporizationProperties.cpp | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.cpp index 3f4656472..3bc63ddde 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.cpp @@ -114,23 +114,12 @@ namespace Opm { } bool OilVaporizationProperties::operator==( const OilVaporizationProperties& rhs ) const { - if( this->m_type == OilVaporization::UNDEF - || rhs.m_type == OilVaporization::UNDEF - || this->m_type != rhs.m_type ) return false; - - switch( this->m_type ) { - case OilVaporization::DRDT: - return this->m_maxDRSDT == rhs.m_maxDRSDT - && this->m_maxDRSDT_allCells == rhs.m_maxDRSDT_allCells - && this->m_maxDRVDT == rhs.m_maxDRVDT; - - case OilVaporization::VAPPARS: - return this->m_vap1 == rhs.m_vap1 - && this->m_vap2 == rhs.m_vap2; - - default: - throw std::logic_error( "UNDEF Oil vaporization property; this should never happen" ); - } + return m_type == rhs.m_type && + m_vap1 == rhs.m_vap1 && + m_vap2 == rhs.m_vap2 && + m_maxDRSDT == rhs.m_maxDRSDT && + m_maxDRSDT_allCells == rhs.m_maxDRSDT_allCells && + m_maxDRVDT == rhs.m_maxDRVDT; } bool OilVaporizationProperties::operator!=( const OilVaporizationProperties& rhs ) const {