From a6f76ddace8bcf662bbb455a946b1fde1dba12ee Mon Sep 17 00:00:00 2001 From: Andreas Lauser Date: Fri, 4 Nov 2016 15:30:37 +0100 Subject: [PATCH] rename the 'flow' binary to 'flow_legacy' and set a symbolic link this is a precurser of merging flow_ebos into the master branch. hopefully, this won't break any existing setups... --- CMakeLists.txt | 16 +++++++++++----- CMakeLists_files.cmake | 4 ++-- examples/{flow.cpp => flow_legacy.cpp} | 0 3 files changed, 13 insertions(+), 7 deletions(-) rename examples/{flow.cpp => flow_legacy.cpp} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4edb01aa5..a412e9949 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,7 +127,7 @@ endif (NOT EIGEN3_FOUND) if (HAVE_OPM_DATA) - add_test( NAME flow_SPE1CASE2 COMMAND flow ${OPM_DATA_ROOT}/spe1/SPE1CASE2.DATA ) + add_test( NAME flow_SPE1CASE2 COMMAND flow_legacy ${OPM_DATA_ROOT}/spe1/SPE1CASE2.DATA ) add_test( NAME flow_sequential_SPE1 COMMAND flow_sequential ${OPM_DATA_ROOT}/spe1/SPE1CASE1.DATA ) add_test( NAME flow_MSW2DH__ COMMAND flow_multisegment ${OPM_DATA_ROOT}/wells_test_suite/MSW/2D_H__/2D_H__.DATA) @@ -135,14 +135,20 @@ if (HAVE_OPM_DATA) if (ERT_PYTHON_PATH) include(OpmPythonTest) - opm_add_python_test( check_INIT_SPE1 ${PROJECT_SOURCE_DIR}/tests/compare_INIT.py $ ${OPM_DATA_ROOT}/spe1/SPE1CASE1.DATA ${OPM_DATA_ROOT}/spe1/eclipse-simulation/SPE1CASE1.INIT + opm_add_python_test( check_INIT_SPE1 ${PROJECT_SOURCE_DIR}/tests/compare_INIT.py $ ${OPM_DATA_ROOT}/spe1/SPE1CASE1.DATA ${OPM_DATA_ROOT}/spe1/eclipse-simulation/SPE1CASE1.INIT TRANX TRANY TRANZ PORO PORV PERMX DX DY DZ DEPTH PVTNUM SATNUM EQLNUM FIPNUM ) - opm_add_python_test( check_INIT_NORNE ${PROJECT_SOURCE_DIR}/tests/compare_INIT.py $ ${OPM_DATA_ROOT}/norne/NORNE_ATW2013.DATA ${OPM_DATA_ROOT}/norne/ECL.2014.2/NORNE_ATW2013.INIT PORO PORV PERMX ) + opm_add_python_test( check_INIT_NORNE ${PROJECT_SOURCE_DIR}/tests/compare_INIT.py $ ${OPM_DATA_ROOT}/norne/NORNE_ATW2013.DATA ${OPM_DATA_ROOT}/norne/ECL.2014.2/NORNE_ATW2013.INIT PORO PORV PERMX ) opm_add_python_test( check_RESTART_SPE1CASE2 ${PROJECT_SOURCE_DIR}/tests/check_RESTART.py - $ ${OPM_DATA_ROOT}/spe1/SPE1CASE2.DATA ${OPM_DATA_ROOT}/spe1/SPE1CASE2_RESTART.DATA ) + $ ${OPM_DATA_ROOT}/spe1/SPE1CASE2.DATA ${OPM_DATA_ROOT}/spe1/SPE1CASE2_RESTART.DATA ) endif() include (${CMAKE_CURRENT_SOURCE_DIR}/compareECLFiles.cmake) -endif() + endif() + + # create a symbolic link from flow to flow_legacy +message("create symlink") +ADD_CUSTOM_TARGET(flow ALL + COMMAND ${CMAKE_COMMAND} -E create_symlink "flow_legacy" "${CMAKE_BINARY_DIR}/bin/flow") + diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake index 2347fd232..9d719ea0b 100644 --- a/CMakeLists_files.cmake +++ b/CMakeLists_files.cmake @@ -103,7 +103,7 @@ list (APPEND TEST_DATA_FILES # find tutorials examples -name '*.c*' -printf '\t%p\n' | sort list (APPEND EXAMPLE_SOURCE_FILES examples/find_zero.cpp - examples/flow.cpp + examples/flow_legacy.cpp examples/flow_sequential.cpp examples/flow_multisegment.cpp examples/flow_solvent.cpp @@ -124,7 +124,7 @@ list (APPEND PROGRAM_SOURCE_FILES examples/sim_2p_incomp.cpp examples/sim_2p_incomp_ad.cpp examples/sim_2p_comp_reorder.cpp - examples/flow.cpp + examples/flow_legacy.cpp examples/flow_sequential.cpp examples/flow_solvent.cpp examples/opm_init_check.cpp diff --git a/examples/flow.cpp b/examples/flow_legacy.cpp similarity index 100% rename from examples/flow.cpp rename to examples/flow_legacy.cpp