Merged from patch-branch to dev-branch

This commit is contained in:
Rebecca Cox
2018-01-18 15:43:27 +01:00
2 changed files with 8 additions and 4 deletions

View File

@@ -92,9 +92,13 @@ void RimCompletionCellIntersectionCalc::calculateWellPathIntersections(const Rim
std::vector<double>& values,
const QDateTime& fromDate)
{
std::vector<HexIntersectionInfo> intersections = RigWellPathIntersectionTools::findRawHexCellIntersections(grid,
wellPath->wellPathGeometry()->m_wellPathPoints);
std::vector<HexIntersectionInfo> intersections;
if (wellPath->wellPathGeometry())
{
intersections = RigWellPathIntersectionTools::findRawHexCellIntersections(grid,
wellPath->wellPathGeometry()->m_wellPathPoints);
}
for (auto& intersection : intersections)
{
values[intersection.m_hexIndex] = RiaDefines::WELL_PATH;