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

Set hard coded string for mock model, and fix Ubuntu build error

Browse Source
This commit is contained in:
jorgenherje
2024-03-07 13:05:10 +01:00
parent 8f50da0212
commit 6a10b6f326
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationLibCode/ModelVisualization/Intersections/RivEnclosingPolygonGenerator.cpp
View File

@@ -206,8 +206,8 @@ void RivEnclosingPolygonGenerator::constructEnclosingPolygon()
// Find next edge in the boundary, i.e. edge containing the next vertex index to look for
currentEdge = findNextEdge( nextVertexIndex, boundaryEdges );
boundaryEdges.erase( currentEdge );
const int start = currentEdge.index1();
const int end = currentEdge.index2();
const auto start = currentEdge.index1();
const auto end = currentEdge.index2();
if ( start == cvf::UNDEFINED_UINT || end == cvf::UNDEFINED_UINT )
{
// Throw error?
@@ -238,7 +238,7 @@ void RivEnclosingPolygonGenerator::constructEnclosingPolygon()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
cvf::EdgeKey RivEnclosingPolygonGenerator::findNextEdge( int vertexIndex, const std::set<cvf::EdgeKey>& boundaryEdges )
cvf::EdgeKey RivEnclosingPolygonGenerator::findNextEdge( cvf::uint vertexIndex, const std::set<cvf::EdgeKey>& boundaryEdges )
{
for ( auto& elm : boundaryEdges )
{

2
ApplicationLibCode/ModelVisualization/Intersections/RivEnclosingPolygonGenerator.h
View File

@@ -78,7 +78,7 @@ public:
void constructEnclosingPolygon();
private:
static cvf::EdgeKey findNextEdge( int vertextIndex, const std::set<cvf::EdgeKey>& boundaryEdges );
static cvf::EdgeKey findNextEdge( cvf::uint vertextIndex, const std::set<cvf::EdgeKey>& boundaryEdges );
private:
PolygonVertexWelder m_polygonVertexWelder; // Add and weld vertices for a polygon, provides vertex index