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

Fixed crash in loading Statistics RegTest manually

Browse Source
This commit is contained in:
Jacob Støren
2014-07-02 14:11:56 +02:00
parent d29590080e
commit c96169c62e
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp
View File

@@ -41,8 +41,11 @@ void RivReservoirPartMgr::clearAndSetReservoir(const RigCaseData* eclipseCase, c
m_allGrids.push_back(new RivGridPartMgr(grids[i], i, faultCollection));
}
// Faults read from file are present only on main grid
m_faultsPartMgr = new RivReservoirFaultsPartMgr(eclipseCase->mainGrid(), faultCollection);
if (eclipseCase->mainGrid())
{
// Faults read from file are present only on main grid
m_faultsPartMgr = new RivReservoirFaultsPartMgr(eclipseCase->mainGrid(), faultCollection);
}
}
}

2
ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
View File

@@ -187,7 +187,7 @@ bool faultComparator(const cvf::ref<RigFault>& a, const cvf::ref<RigFault>& b)
//--------------------------------------------------------------------------------------------------
void RimFaultCollection::syncronizeFaults()
{
if (!(m_reservoirView && m_reservoirView->eclipseCase() && m_reservoirView->eclipseCase()->reservoirData()) ) return;
if (!(m_reservoirView && m_reservoirView->eclipseCase() && m_reservoirView->eclipseCase()->reservoirData() && m_reservoirView->eclipseCase()->reservoirData()->mainGrid()) ) return;
cvf::ref<cvf::Color3fArray> partColors = RivColorTableArray::colorTableArray();

2
OctavePlugin/OctaveScripts/kslice.m
View File

@@ -1,4 +1,4 @@
addpath("/home/builder/Projects/ResInsightBuildDir/OctavePlugin");
CInfo = riGetActiveCellInfo();
SOIL = riGetActiveCellProperty("SOIL");