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 #2194 from akva2/rockcomp_test

Browse Source 
add test case for rockcomp
This commit is contained in:
Arne Morten Kvarving 2019-11-28 11:52:19 +01:00 committed by GitHub
commit e235fced21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compareECLFiles.cmake
View File

@ -189,6 +189,13 @@ add_test_compareECLFiles(CASENAME spe1_thermal
REL_TOL ${rel_tol} REL_TOL ${rel_tol}
DIR spe1) DIR spe1)
add_test_compareECLFiles(CASENAME spe1_rockcomp
FILENAME SPE1CASE2_ROCK2DTR
SIMULATOR flow
ABS_TOL ${abs_tol}
REL_TOL ${rel_tol}
DIR spe1)
add_test_compareECLFiles(CASENAME spe1_metric_vfp1 add_test_compareECLFiles(CASENAME spe1_metric_vfp1
FILENAME SPE1CASE1_METRIC_VFP1 FILENAME SPE1CASE1_METRIC_VFP1
SIMULATOR flow SIMULATOR flow

36
tests/update_reference_data.sh
View File

@ -58,6 +58,7 @@ tests[spe12p]="flow spe1 SPE1CASE2_2P spe1_2p"
tests[spe1oilgas]="flow spe1 SPE1CASE2_OILGAS spe1_oilgas" tests[spe1oilgas]="flow spe1 SPE1CASE2_OILGAS spe1_oilgas"
tests[spe1nowells]="flow spe1 SPE1CASE2_NOWELLS spe1_nowells" tests[spe1nowells]="flow spe1 SPE1CASE2_NOWELLS spe1_nowells"
tests[spe1thermal]="flow spe1 SPE1CASE2_THERMAL spe1_thermal" tests[spe1thermal]="flow spe1 SPE1CASE2_THERMAL spe1_thermal"
tests[spe1rockcomp]="flow spe1 SPE1CASE2_ROCK2DTR spe1_rockcomp"
tests[ctaquifer_2d_oilwater]="flow aquifer-oilwater 2D_OW_CTAQUIFER ctaquifer_2d_oilwater" tests[ctaquifer_2d_oilwater]="flow aquifer-oilwater 2D_OW_CTAQUIFER ctaquifer_2d_oilwater"
tests[fetkovich_2d]="flow aquifer-fetkovich 2D_FETKOVICHAQUIFER fetkovich_2d" tests[fetkovich_2d]="flow aquifer-fetkovich 2D_FETKOVICHAQUIFER fetkovich_2d"
tests[msw_2d_h]="flow msw_2d_h 2D_H__" tests[msw_2d_h]="flow msw_2d_h 2D_H__"
@ -89,19 +90,30 @@ tests[udq]="flow udq_actionx UDQ_WCONPROD udq_wconprod"
tests[spe1_foam]="flow spe1_foam SPE1FOAM" tests[spe1_foam]="flow spe1_foam SPE1FOAM"
changed_tests="" changed_tests=""
for test_name in ${!tests[*]}
# Read failed tests
FAILED_TESTS=`cat $WORKSPACE/$configuration/build-opm-simulators/Testing/Temporary/LastTestsFailed*.log`
for failed_test in $FAILED_TESTS
do do
binary=`echo ${tests[$test_name]} | awk -F ' ' '{print $1}'` failed=`echo $failed_test | sed -e 's/.*:compareECLFiles_//g'`
dirname=`echo ${tests[$test_name]} | awk -F ' ' '{print $2}'` for test_name in ${!tests[*]}
casename=`echo ${tests[$test_name]} | awk -F ' ' '{print $3}'` do
tname=`echo ${tests[$test_name]} | awk -F ' ' '{print $4}'` binary=`echo ${tests[$test_name]} | awk -F ' ' '{print $1}'`
test -z "$tname" && tname=$dirname dirname=`echo ${tests[$test_name]} | awk -F ' ' '{print $2}'`
copyToReferenceDir \ casename=`echo ${tests[$test_name]} | awk -F ' ' '{print $3}'`
$configuration/build-opm-simulators/tests/results/$binary+$tname/ \ tname=`echo ${tests[$test_name]} | awk -F ' ' '{print $4}'`
$OPM_TESTS_ROOT/$dirname/opm-simulation-reference/$binary \ test -z "$tname" && tname=$dirname
$casename \ if grep -q "$failed" <<< "$binary+$casename"
EGRID INIT RFT SMSPEC UNRST UNSMRY then
test $? -eq 0 && changed_tests="$changed_tests $test_name" copyToReferenceDir \
$configuration/build-opm-simulators/tests/results/$binary+$tname/ \
$OPM_TESTS_ROOT/$dirname/opm-simulation-reference/$binary \
$casename \
EGRID INIT RFT SMSPEC UNRST UNSMRY
test $? -eq 0 && changed_tests="$changed_tests $test_name"
fi
done
done done
# special tests # special tests