From d099d88625da77357593e1583a27716126b41d8c Mon Sep 17 00:00:00 2001 From: Tor Harald Sandve Date: Tue, 5 Dec 2017 09:26:01 +0100 Subject: [PATCH] Add SPE1CASE2_OILGAS test case --- compareECLFiles.cmake | 7 +++++++ tests/update_reference_data.sh | 12 +++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/compareECLFiles.cmake b/compareECLFiles.cmake index 8c6a0440e..c06fcf4fb 100644 --- a/compareECLFiles.cmake +++ b/compareECLFiles.cmake @@ -136,6 +136,13 @@ add_test_compareECLFiles(CASENAME spe1_2p REL_TOL ${coarse_rel_tol} DIR spe1) +add_test_compareECLFiles(CASENAME spe1_oilgas + FILENAME SPE1CASE2_OILGAS + SIMULATOR flow + ABS_TOL ${abs_tol} + REL_TOL ${coarse_rel_tol} + DIR spe1) + add_test_compareECLFiles(CASENAME spe1 FILENAME SPE1CASE1 SIMULATOR flow_sequential diff --git a/tests/update_reference_data.sh b/tests/update_reference_data.sh index 0a28341a4..8a2487eb9 100755 --- a/tests/update_reference_data.sh +++ b/tests/update_reference_data.sh @@ -20,7 +20,7 @@ copyToReferenceDir () { } tests=${@:2} -test -z "$tests" && tests="spe11 spe12 spe12p spe3 spe5 spe9 norne_init msw_2d_h msw_3d_hfa polymer2d spe9group" +test -z "$tests" && tests="spe11 spe12 spe12p spe1oilgas spe3 spe5 spe9 norne_init msw_2d_h msw_3d_hfa polymer2d spe9group" if grep -q -i "norne " <<< $ghprbCommentBody then if test -d $WORKSPACE/deps/opm-data/norne/flow @@ -71,6 +71,15 @@ for test_name in ${tests}; do EGRID INIT SMSPEC UNRST UNSMRY fi + if grep -q "spe1oilgas" <<< $test_name + then + copyToReferenceDir \ + $configuration/build-opm-simulators/tests/results/flow+spe1_oilgas/ \ + $OPM_DATA_ROOT/spe1/opm-simulation-reference/flow \ + SPE1CASE2_OILGAS \ + EGRID INIT SMSPEC UNRST UNSMRY + fi + if grep -q "msw_2d_h" <<< $test_name then copyToReferenceDir \ @@ -184,6 +193,7 @@ then git status | grep "SPE1CASE2" && tests="$tests spe12" git status | grep "SPE3CASE1" && tests="$tests spe3" git status | grep "SPE1CASE2_2P" && tests="$tests spe1-2p" + git status | grep "SPE1CASE2_OILGAS" && tests="$tests spe1oilgas" git status | grep "SPE5CASE1" && tests="$tests spe5" git status | grep "SPE9_CP" && tests="$tests spe9" git status | grep "SPE9_CP_GROUP" && tests="$tests spe9group"