Merge remote-tracking branch 'refs/remotes/origin/dev'

Conflicts:
	ResInsightVersion.cmake
This commit is contained in:
Magne Sjaastad
2017-03-02 11:46:25 +01:00
18 changed files with 491 additions and 130 deletions

View File

@@ -254,7 +254,7 @@ bool RimEclipseWell::intersectsStaticWellCellsFilteredCells() const
if (this->wellResults() == nullptr) return false;
// NOTE: Read out static well cells, union of well cells across all time steps
const RigWellResultFrame& wrsf = this->wellResults()->m_staticWellCells;
const RigWellResultFrame& wrsf = this->wellResults()->staticWellCells();
// NOTE: Use first time step for visibility evaluation
size_t frameIndex = 0;