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 pull request #1361 from totto82/add_gasoil_test

Browse Source 
Add SPE1CASE2_OILGAS test case
This commit is contained in:
Atgeirr Flø Rasmussen 2017-12-05 20:22:32 +01:00 committed by GitHub
commit 8a5712a5d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compareECLFiles.cmake
View File

@ -136,6 +136,13 @@ add_test_compareECLFiles(CASENAME spe1_2p
REL_TOL ${coarse_rel_tol} REL_TOL ${coarse_rel_tol}
DIR spe1) 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 add_test_compareECLFiles(CASENAME spe1
FILENAME SPE1CASE1 FILENAME SPE1CASE1
SIMULATOR flow_sequential SIMULATOR flow_sequential

12
tests/update_reference_data.sh
View File

@ -20,7 +20,7 @@ copyToReferenceDir () {
} }
tests=${@:2} 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 if grep -q -i "norne " <<< $ghprbCommentBody
then then
if test -d $WORKSPACE/deps/opm-data/norne/flow if test -d $WORKSPACE/deps/opm-data/norne/flow
@ -71,6 +71,15 @@ for test_name in ${tests}; do
EGRID INIT SMSPEC UNRST UNSMRY EGRID INIT SMSPEC UNRST UNSMRY
fi 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 if grep -q "msw_2d_h" <<< $test_name
then then
copyToReferenceDir \ copyToReferenceDir \
@ -184,6 +193,7 @@ then
git status | grep "SPE1CASE2" && tests="$tests spe12" git status | grep "SPE1CASE2" && tests="$tests spe12"
git status | grep "SPE3CASE1" && tests="$tests spe3" git status | grep "SPE3CASE1" && tests="$tests spe3"
git status | grep "SPE1CASE2_2P" && tests="$tests spe1-2p" 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 "SPE5CASE1" && tests="$tests spe5"
git status | grep "SPE9_CP" && tests="$tests spe9" git status | grep "SPE9_CP" && tests="$tests spe9"
git status | grep "SPE9_CP_GROUP" && tests="$tests spe9group" git status | grep "SPE9_CP_GROUP" && tests="$tests spe9group"