diff --git a/CMakeLists.txt b/CMakeLists.txt index 931758bd9..e597fbc3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -128,13 +128,10 @@ endif (NOT EIGEN3_FOUND) if (HAVE_OPM_DATA) - add_test( NAME flow_MSW2DH__ COMMAND flow_multisegment ${OPM_DATA_ROOT}/wells_test_suite/MSW/2D_H__/2D_H__.DATA) - 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/compareECLFiles.cmake b/compareECLFiles.cmake index 686dbe6d5..455a32dac 100644 --- a/compareECLFiles.cmake +++ b/compareECLFiles.cmake @@ -97,6 +97,7 @@ add_test_compareECLFiles(spe1 SPE1CASE2 flow ${abs_tol} ${rel_tol} compareECLFil add_test_compareECLFiles(spe1 SPE1CASE1 flow_sequential ${abs_tol} ${rel_tol} compareECLFiles "") add_test_compareECLFiles(spe3 SPE3CASE1 flow ${abs_tol} ${rel_tol} compareECLFiles "") add_test_compareECLFiles(spe9 SPE9_CP_SHORT flow ${abs_tol} ${rel_tol} compareECLFiles "") +add_test_compareECLFiles(msw_2d_h 2D_H__ flow_multisegment ${abs_tol} ${rel_tol} compareECLFiles "") # Restart tests opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-restart-regressionTest.sh "") diff --git a/tests/update_reference_data.sh b/tests/update_reference_data.sh index 31b056d1e..bd60a4ced 100755 --- a/tests/update_reference_data.sh +++ b/tests/update_reference_data.sh @@ -19,7 +19,7 @@ copyToReferenceDir () { } tests=${@:2} -test -z "$tests" && tests="spe11 spe12 spe3 spe9 norne_init" +test -z "$tests" && tests="spe11 spe12 spe3 spe9 norne_init msw_2d_h" if grep -q -i "norne " <<< $ghprbCommentBody then if test -d $WORKSPACE/deps/opm-data/norne/flow @@ -49,6 +49,15 @@ for test_name in ${tests}; do EGRID INIT SMSPEC UNRST UNSMRY fi + if grep -q "msw_2d_h" <<< $test_name + then + copyToReferenceDir \ + $configuration/build-opm-simulators/tests/results/flow_multisegment+msw_2d_h/ \ + $OPM_DATA_ROOT/msw_2d_h/opm-simulation-reference/ \ + 2D_H__ \ + EGRID INIT SMSPEC UNRST UNSMRY + fi + if grep -q "spe3" <<< $test_name then copyToReferenceDir \ @@ -95,6 +104,7 @@ then git status | grep "SPE1CASE2" && tests="$tests spe12" git status | grep "SPE3CASE1" && tests="$tests spe3" git status | grep "SPE9_CP" && tests="$tests spe9" + git status | grep "2D_H__" && tests="$tests msw_2d_h" git status | grep "NORNE_ATW2013.INIT" && tests="$tests norne_init" git status | grep "NORNE_ATW2013.UNSMRY" && tests="$tests norne_full" popd > /dev/null