OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-25 06:38:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Sector Export: fix bug comparing caf::VecIjk1 with caf::VecIjk0.

Browse Source
This commit is contained in:
Kristian Bendiksen committed 2025-11-17 13:04:13 +01:00
1 parent 5a7e987034
commit 3a8d521bc2
5 files changed
+7 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelFeature.cpp
-1
View File
@@ -822,7 +822,6 @@ std::vector<RigSimWellData*>
for ( const auto& point : resultPoints )
{
// Get IJK if available
// TODO: bug? min/max is zero-indexed?
auto ijkOpt = point.cellIjk();
if ( !ijkOpt.has_value() ) continue;
ApplicationLibCode/FileInterface/RifReaderEclipseWell.cpp
+1 -1
View File
@@ -207,7 +207,7 @@ RigWellResultPoint RifReaderEclipseWell::createWellResultPoint( const RigEclipse
if ( auto ijk = grid->ijkFromCellIndex( gridCellIndex ) )
{
resultPoint.setIjk( ijk->toOneBased() );
resultPoint.setIjk( ijk.value() );
}
}
ApplicationLibCode/ReservoirDataModel/Well/RigSimulationWellCenterLineCalculator.cpp
+1 -1
View File
@@ -233,7 +233,7 @@ void RigSimulationWellCenterLineCalculator::calculateWellPipeCenterlineForTimeSt
{
if ( resultPoint.cellIjk().has_value() )
{
branchTxt += QString( " %1 \n" ).arg( QString::fromStdString( ( *resultPoint.cellIjk() ).toString() ) );
branchTxt += QString( " %1 \n" ).arg( QString::fromStdString( ( *resultPoint.cellIjk() ).toOneBased().toString() ) );
}
}
RiaLogging::debug( branchTxt );
ApplicationLibCode/ReservoirDataModel/Well/RigWellResultPoint.cpp
+2 -2
View File
@@ -305,7 +305,7 @@ cvf::Vec3d RigWellResultPoint::bottomPosition() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::optional<caf::VecIjk1> RigWellResultPoint::cellIjk() const
std::optional<caf::VecIjk0> RigWellResultPoint::cellIjk() const
{
return m_cellIjk;
}
@@ -313,7 +313,7 @@ std::optional<caf::VecIjk1> RigWellResultPoint::cellIjk() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigWellResultPoint::setIjk( caf::VecIjk1 cellIJK )
void RigWellResultPoint::setIjk( caf::VecIjk0 cellIJK )
{
m_cellIjk = cellIJK;
}
ApplicationLibCode/ReservoirDataModel/Well/RigWellResultPoint.h
+3 -3
View File
@@ -73,8 +73,8 @@ struct RigWellResultPoint
cvf::Vec3d bottomPosition() const;
std::optional<caf::VecIjk1> cellIjk() const;
void setIjk( caf::VecIjk1 cellIJK );
std::optional<caf::VecIjk0> cellIjk() const;
void setIjk( caf::VecIjk0 cellIJK );
private:
size_t m_gridIndex;
@@ -96,5 +96,5 @@ private:
double m_connectionFactor;
bool m_isConnectedToValve;
std::optional<caf::VecIjk1> m_cellIjk;
std::optional<caf::VecIjk0> m_cellIjk;
};