OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-28 22:14:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #509 from joakim-hove/use-opm-data

Browse Source 
Use opm data
This commit is contained in:
Atgeirr Flø Rasmussen 2015-10-21 21:57:45 +02:00
commit a362f2cf09
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -55,7 +55,6 @@ else()
endif() endif()
option( INCLUDE_NON_PUBLIC_TESTS "Include the tests which need non-public data" OFF)
# not the same location as most of the other projects? this hook overrides # not the same location as most of the other projects? this hook overrides
macro (dir_hook) macro (dir_hook)
@ -66,6 +65,10 @@ endmacro (dir_hook)
# the build starts, so it makes sense to keep the data there then. # the build starts, so it makes sense to keep the data there then.
include (OpmInit) include (OpmInit)
# Look for the opm-data repository; if found the variable
# HAVE_OPM_DATA will be set to true.
include( Findopm-data )
# list of prerequisites for this particular project; this is in a # list of prerequisites for this particular project; this is in a
# separate file (in cmake/Modules sub-directory) because it is shared # separate file (in cmake/Modules sub-directory) because it is shared
# with the find module # with the find module
@ -116,3 +119,9 @@ if (NOT EIGEN3_FOUND)
include_directories (${CMAKE_BINARY_DIR}/eigen3-installed/include/eigen3) include_directories (${CMAKE_BINARY_DIR}/eigen3-installed/include/eigen3)
add_dependencies (opmautodiff Eigen3) add_dependencies (opmautodiff Eigen3)
endif (NOT EIGEN3_FOUND) endif (NOT EIGEN3_FOUND)
if (HAVE_OPM_DATA)
add_test( NAME flow_SPE1 COMMAND flow ${OPM_DATA_ROOT}/spe1/SPE1CASE1.DATA )
endif()

11
CMakeLists_files.cmake
View File

@ -47,6 +47,7 @@ list (APPEND MAIN_SOURCE_FILES
opm/autodiff/VFPInjProperties.cpp opm/autodiff/VFPInjProperties.cpp
) )
# originally generated with the command: # originally generated with the command:
# find tests -name '*.cpp' -a ! -wholename '*/not-unit/*' -printf '\t%p\n' | sort # find tests -name '*.cpp' -a ! -wholename '*/not-unit/*' -printf '\t%p\n' | sort
list (APPEND TEST_SOURCE_FILES list (APPEND TEST_SOURCE_FILES
@ -69,16 +70,6 @@ list (APPEND TEST_DATA_FILES
tests/VFPPROD2 tests/VFPPROD2
) )
# Note, these two files are not included in the repo.
# If enabling INCLUDE_NON_PUBLIC_TESTS, please add add symlink to the folder
# "non_public" containing these two files.
if (INCLUDE_NON_PUBLIC_TESTS)
list (APPEND TEST_DATA_FILES
tests/non_public/SPE1_opm.DATA
tests/non_public/spe1.xml
)
endif()
# originally generated with the command: # originally generated with the command:
# find tutorials examples -name '*.c*' -printf '\t%p\n' | sort # find tutorials examples -name '*.c*' -printf '\t%p\n' | sort