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 #1525 from totto82/addTestForEhystr

Browse Source 
Add  test for cases with Carlson’s hysteresis model
This commit is contained in:
Andreas Lauser 2018-06-29 14:03:29 +02:00 committed by GitHub
commit 6e5793b674
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compareECLFiles.cmake
View File

@ -259,6 +259,17 @@ add_test_compareECLFiles(CASENAME spe5
REL_TOL ${coarse_rel_tol} REL_TOL ${coarse_rel_tol}
TEST_ARGS max_iter=20) TEST_ARGS max_iter=20)
add_test_compareECLFiles(CASENAME spe5_ehystr2_0
FILENAME SPE5CASE_GAS_EHYSTR2_0
SIMULATOR flow
ABS_TOL ${abs_tol}
REL_TOL ${rel_tol})
add_test_compareECLFiles(CASENAME spe5_ehystr2_1
FILENAME SPE5CASE_SOLVENT_EHYSTR2_1
SIMULATOR flow
ABS_TOL ${abs_tol}
REL_TOL ${rel_tol})
# Restart tests # Restart tests
opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-restart-regressionTest.sh "") opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-restart-regressionTest.sh "")

20
tests/update_reference_data.sh
View File

@ -20,7 +20,7 @@ copyToReferenceDir () {
} }
tests=${@:2} tests=${@:2}
test -z "$tests" && tests="spe11 spe12 spe12p spe1oilgas spe1nowells spe1thermal ctaquifer_2d_oilwater spe3 spe5 spe9 norne_init msw_2d_h msw_3d_hfa polymer2d spe9group polymer_oilwater" test -z "$tests" && tests="spe11 spe12 spe12p spe1oilgas spe1nowells spe1thermal ctaquifer_2d_oilwater spe3 spe5 spe9 norne_init msw_2d_h msw_3d_hfa polymer2d spe9group polymer_oilwater spe5_ehystr2_0 spe5_ehystr2_1"
if grep -q -i "norne " <<< $ghprbCommentBody if grep -q -i "norne " <<< $ghprbCommentBody
then then
if test -d $WORKSPACE/deps/opm-tests/norne/flow if test -d $WORKSPACE/deps/opm-tests/norne/flow
@ -167,6 +167,24 @@ for test_name in ${tests}; do
EGRID INIT SMSPEC UNRST UNSMRY EGRID INIT SMSPEC UNRST UNSMRY
fi fi
if grep -q "spe5_ehystr2_0" <<< $test_name
then
copyToReferenceDir \
$configuration/build-opm-simulators/tests/results/flow+spe5_ehystr2_0/ \
$OPM_TESTS_ROOT/spe5_ehystr2_0/opm-simulation-reference/flow \
SPE5CASE_GAS_EHYSTR2_0 \
EGRID INIT SMSPEC UNRST UNSMRY
fi
if grep -q "spe5_ehystr2_1" <<< $test_name
then
copyToReferenceDir \
$configuration/build-opm-simulators/tests/results/flow+spe5_ehystr2_1/ \
$OPM_TESTS_ROOT/spe5_ehystr2_1/opm-simulation-reference/flow \
SPE5CASE_SOLVENT_EHYSTR2_1 \
EGRID INIT SMSPEC UNRST UNSMRY
fi
if grep -q "spe9group" <<< $test_name if grep -q "spe9group" <<< $test_name
then then
copyToReferenceDir \ copyToReferenceDir \