OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Ert: Updated to 3f8166c4739fdfe654d3992920a36bf0a6981b4d

Browse Source 
Had to remove a kræsj.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
ApplicationCode/CMakeLists.txt
+2 -2
View File
@@ -218,8 +218,8 @@ set( LINK_LIBRARIES
ecl ecl
ert_util ert_util
geometry ert_geometry
well ecl_well
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
${QT_LIBRARIES} ${QT_LIBRARIES}
ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt
+2 -2
View File
@@ -68,8 +68,8 @@ set( LINK_LIBRARIES
ecl ecl
ert_util ert_util
geometry ert_geometry
well ecl_well
${QT_LIBRARIES} ${QT_LIBRARIES}
) )
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
+14 -1
View File
@@ -117,7 +117,20 @@ bool transferGridCellData(RigMainGrid* mainGrid, RigGridBase* localGrid, const e
} }
else 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); int fractureActiveIndex = ecl_grid_get_active_fracture_index1(localEclGrid, gIdx);
ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/CMakeLists.txt
+1 -1
View File
@@ -37,7 +37,7 @@ set( LINK_LIBRARIES
LibCore LibCore
ecl ecl
well ecl_well
ert_util ert_util
${QT_LIBRARIES} ${QT_LIBRARIES}
CMakeLists.txt
+11 -5
View File
@@ -40,11 +40,17 @@ include (ResInsightVersion.cmake)
add_subdirectory(ThirdParty/Ert/devel) add_subdirectory(ThirdParty/Ert/devel)
include_directories( include_directories(
${CMAKE_SOURCE_DIR}/ThirdParty/Ert/devel/libecl/src ${CMAKE_SOURCE_DIR}/ThirdParty/Ert/devel/libecl/include/ert/ecl
${CMAKE_SOURCE_DIR}/ThirdParty/Ert/devel/libert_util/src ${CMAKE_SOURCE_DIR}/ThirdParty/Ert/devel/libert_util/include/ert/util
${CMAKE_SOURCE_DIR}/ThirdParty/Ert/devel/libgeometry/src ${CMAKE_SOURCE_DIR}/ThirdParty/Ert/devel/libgeometry/include/ert/geometry
${CMAKE_SOURCE_DIR}/ThirdParty/Ert/devel/libwell/src ${CMAKE_SOURCE_DIR}/ThirdParty/Ert/devel/libecl_well/include/ert/ecl_well
${CMAKE_BINARY_DIR}/ThirdParty/Ert/devel/libert_util/src ${CMAKE_SOURCE_DIR}/ThirdParty/Ert/devel/libecl/include
${CMAKE_SOURCE_DIR}/ThirdParty/Ert/devel/libert_util/include
${CMAKE_SOURCE_DIR}/ThirdParty/Ert/devel/libgeometry/include
${CMAKE_SOURCE_DIR}/ThirdParty/Ert/devel/libecl_well/include
${CMAKE_BINARY_DIR}/ThirdParty/Ert/devel/libert_util/include/ert/util
${CMAKE_BINARY_DIR}/ThirdParty/Ert/devel/libert_util/include
) )
ThirdParty/Ert/devel/libenkf/applications/ert_gui/share/doc/kr�sj.txt
Vendored
-5
View File
@@ -1,5 +0,0 @@
Refcase <-> history source
* Kanskje det er ERT som må sjekka om verdien er sett og så utsetta evt. kjøring?
Copy from case:
* kræsj.