OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix build issues MSVC 17.6.2

Browse Source
This commit is contained in:
Magne Sjaastad 2023-05-30 21:53:32 +02:00 committed by jonjenssen
parent e1784bb37a
commit 0e25f364f8
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp
View File

@ -158,7 +158,7 @@ RimWellLogExtractionCurve::~RimWellLogExtractionCurve()
void RimWellLogExtractionCurve::setWellPath( RimWellPath* wellPath ) void RimWellLogExtractionCurve::setWellPath( RimWellPath* wellPath )
{ {
m_wellPath = wellPath; m_wellPath = wellPath;
if ( m_wellPath == m_refWellPath ) m_refWellPath = nullptr; if ( m_wellPath() == m_refWellPath() ) m_refWellPath = nullptr;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -306,7 +306,7 @@ void RimWellLogExtractionCurve::fieldChangedByUi( const caf::PdmFieldHandle* cha
} }
else if ( changedField == &m_wellPath ) else if ( changedField == &m_wellPath )
{ {
if ( m_wellPath == m_refWellPath ) m_refWellPath = nullptr; if ( m_wellPath() == m_refWellPath() ) m_refWellPath = nullptr;
this->loadDataAndUpdate( true ); this->loadDataAndUpdate( true );
} }
else if ( ( changedField == &m_refWellPath ) || ( changedField == &m_timeStep ) || ( changedField == &m_trajectoryType ) || else if ( ( changedField == &m_refWellPath ) || ( changedField == &m_timeStep ) || ( changedField == &m_trajectoryType ) ||

2
ApplicationLibCode/ReservoirDataModel/Completions/RigTransmissibilityCondenser.cpp
View File

@ -118,8 +118,6 @@ std::set<RigTransmissibilityCondenser::CellAddress> RigTransmissibilityCondenser
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
double RigTransmissibilityCondenser::condensedTransmissibility( CellAddress externalCell1, CellAddress externalCell2 ) double RigTransmissibilityCondenser::condensedTransmissibility( CellAddress externalCell1, CellAddress externalCell2 )
{ {
CAF_ASSERT( !( externalCell1 == externalCell2 ) );
if ( m_condensedTransmissibilities.empty() ) if ( m_condensedTransmissibilities.empty() )
{ {
calculateCondensedTransmissibilities(); calculateCondensedTransmissibilities();