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

Ert: Updated to 3f8166c4739fdfe654d3992920a36bf0a6981b4d

Browse Source 
Had to remove a krsj.txt file that caused trouble (again)
p4#: 20320
This commit is contained in:
Jacob Støren
2013-01-31 15:55:49 +01:00
parent 85238529ef
commit b33dd15372
6 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt
View File

@@ -68,8 +68,8 @@ set( LINK_LIBRARIES
ecl
ert_util
geometry
well
ert_geometry
ecl_well
${QT_LIBRARIES}
)

15
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@@ -117,7 +117,20 @@ bool transferGridCellData(RigMainGrid* mainGrid, RigGridBase* localGrid, const e
}
else
{
cell.setActiveIndexInMatrixModel(cvf::UNDEFINED_SIZE_T);
ecl_coarse_cell_type * coarseCellData = ecl_grid_get_cell_coarse_group1( localEclGrid , gIdx);
if ( false )//coarseCellData)
{
matrixActiveIndex = ecl_coarse_cell_get_active_index(coarseCellData);
}
if (matrixActiveIndex != -1)
{
cell.setActiveIndexInMatrixModel(matrixActiveStartIndex + matrixActiveIndex);
}
else
{
cell.setActiveIndexInMatrixModel(cvf::UNDEFINED_SIZE_T);
}
}
int fractureActiveIndex = ecl_grid_get_active_fracture_index1(localEclGrid, gIdx);