OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into frankenstein_merge_master

Browse Source
This commit is contained in:
Andreas Lauser
2016-09-28 21:11:25 +02:00
parent 6bc8080722 3e04ef89f4
commit 36b00ba570
27 changed files with 358 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -145,7 +145,5 @@ if (HAVE_OPM_DATA)
$<TARGET_FILE:flow> ${OPM_DATA_ROOT}/spe1/SPE1CASE2.DATA ${OPM_DATA_ROOT}/spe1/SPE1CASE2_RESTART.DATA )
endif()
include (${CMAKE_CURRENT_SOURCE_DIR}/compareECLFiles.cmake)
include (${CMAKE_CURRENT_SOURCE_DIR}/compareECLFiles.cmake)
endif()