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

#3600 Fix crash with 2d Maps and LGRs.

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-11-01 13:21:13 +01:00
parent 8d2813ab39
commit 0291dd2237
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ApplicationCode/ProjectDataModel/Rim2dGridProjection.cpp
View File

@@ -3,6 +3,7 @@
#include "RiaWeightedMeanCalculator.h" #include "RiaWeightedMeanCalculator.h"
#include "RigActiveCellInfo.h" #include "RigActiveCellInfo.h"
#include "RigCell.h"
#include "RigEclipseCaseData.h" #include "RigEclipseCaseData.h"
#include "RigHexIntersectionTools.h" #include "RigHexIntersectionTools.h"
#include "RigMainGrid.h" #include "RigMainGrid.h"
@@ -475,19 +476,21 @@ std::vector<std::pair<size_t, float>> Rim2dGridProjection::visibleCellsAndWeight
cvf::Vec3d hexCorners[8]; cvf::Vec3d hexCorners[8];
for (size_t globalCellIdx : allCellIndices) for (size_t globalCellIdx : allCellIndices)
{ {
if ((*m_cellVisibility)[globalCellIdx]) size_t localCellIdx = 0u;
RigGridBase* localGrid = mainGrid()->gridAndGridLocalIdxFromGlobalCellIdx(globalCellIdx, &localCellIdx);
if (localGrid == mainGrid())
{ {
size_t localCellIdx = 0u; if ((*m_cellVisibility)[globalCellIdx])
RigGridBase* localGrid = mainGrid()->gridAndGridLocalIdxFromGlobalCellIdx(globalCellIdx, &localCellIdx);
localGrid->cellCornerVertices(localCellIdx, hexCorners);
std::vector<HexIntersectionInfo> intersections;
float weight = 1.0f;
if (RigHexIntersectionTools::lineHexCellIntersection(highestPoint, lowestPoint, hexCorners, 0, &intersections))
{ {
weight = std::max(1.0, (intersections.back().m_intersectionPoint - intersections.front().m_intersectionPoint).length()); localGrid->cellCornerVertices(localCellIdx, hexCorners);
std::vector<HexIntersectionInfo> intersections;
float weight = 1.0f;
if (RigHexIntersectionTools::lineHexCellIntersection(highestPoint, lowestPoint, hexCorners, 0, &intersections))
{
weight = std::max(1.0, (intersections.back().m_intersectionPoint - intersections.front().m_intersectionPoint).length());
}
matchingVisibleCellsAndWeight.push_back(std::make_pair(globalCellIdx, weight));
} }
matchingVisibleCellsAndWeight.push_back(std::make_pair(globalCellIdx, weight));
} }
} }