OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1548 from akva2/simplify_oilvap_equality

Browse Source 
simplify the OilVaporization equality operator
This commit is contained in:
Arne Morten Kvarving 2020-03-10 12:31:10 +01:00 committed by GitHub
commit c2108265b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.cpp
View File

@ -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 {