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 #1121 from akva2/fix_update_paths

Browse Source 
fixed: paths in data update script
This commit is contained in:
Atgeirr Flø Rasmussen 2017-04-05 12:54:11 +02:00 committed by GitHub
commit df2b1190de
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compareECLFiles.cmake
View File

@ -105,7 +105,7 @@ opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-restart-regressionTest.sh ""
# Cruder tolerances for the restarted tests # Cruder tolerances for the restarted tests
set(abs_tol_restart 2e-1) set(abs_tol_restart 2e-1)
set(rel_tol_restart 4e-5) set(rel_tol_restart 4e-5)
foreach(sim flow flow_ebos) foreach(sim flow_legacy flow_ebos)
add_test_compare_restarted_simulation(spe1 SPE1CASE2_ACTNUM ${sim} ${abs_tol_restart} ${rel_tol_restart}) add_test_compare_restarted_simulation(spe1 SPE1CASE2_ACTNUM ${sim} ${abs_tol_restart} ${rel_tol_restart})
add_test_compare_restarted_simulation(spe9 SPE9_CP_SHORT ${sim} ${abs_tol_restart} ${rel_tol_restart}) add_test_compare_restarted_simulation(spe9 SPE9_CP_SHORT ${sim} ${abs_tol_restart} ${rel_tol_restart})
endforeach() endforeach()

10
tests/update_reference_data.sh
View File

@ -43,7 +43,7 @@ for test_name in ${tests}; do
if grep -q "spe12" <<< $test_name if grep -q "spe12" <<< $test_name
then then
copyToReferenceDir \ copyToReferenceDir \
$configuration/build-opm-simulators/tests/results/flow+spe1/ \ $configuration/build-opm-simulators/tests/results/flow_legacy+spe1/ \
$OPM_DATA_ROOT/spe1/opm-simulation-reference/ \ $OPM_DATA_ROOT/spe1/opm-simulation-reference/ \
SPE1CASE2 \ SPE1CASE2 \
EGRID INIT SMSPEC UNRST UNSMRY EGRID INIT SMSPEC UNRST UNSMRY
@ -61,7 +61,7 @@ for test_name in ${tests}; do
if grep -q "spe3" <<< $test_name if grep -q "spe3" <<< $test_name
then then
copyToReferenceDir \ copyToReferenceDir \
$configuration/build-opm-simulators/tests/results/flow+spe3/ \ $configuration/build-opm-simulators/tests/results/flow_legacy+spe3/ \
$OPM_DATA_ROOT/spe3/opm-simulation-reference/ \ $OPM_DATA_ROOT/spe3/opm-simulation-reference/ \
SPE3CASE1 \ SPE3CASE1 \
EGRID INIT PRT SMSPEC UNRST UNSMRY EGRID INIT PRT SMSPEC UNRST UNSMRY
@ -70,7 +70,7 @@ for test_name in ${tests}; do
if grep -q "spe9" <<< $test_name if grep -q "spe9" <<< $test_name
then then
copyToReferenceDir \ copyToReferenceDir \
$configuration/build-opm-simulators/tests/results/flow+spe9/ \ $configuration/build-opm-simulators/tests/results/flow_legacy+spe9/ \
$OPM_DATA_ROOT/spe9/opm-simulation-reference/ \ $OPM_DATA_ROOT/spe9/opm-simulation-reference/ \
SPE9_CP_SHORT \ SPE9_CP_SHORT \
EGRID INIT PRT SMSPEC UNRST UNSMRY EGRID INIT PRT SMSPEC UNRST UNSMRY
@ -79,7 +79,7 @@ for test_name in ${tests}; do
if grep -q "norne_init" <<< $test_name if grep -q "norne_init" <<< $test_name
then then
copyToReferenceDir \ copyToReferenceDir \
$configuration/build-opm-simulators/tests/results/init/flow+norne/ \ $configuration/build-opm-simulators/tests/results/init/flow_legacy+norne/ \
$OPM_DATA_ROOT/norne/opm-simulation-reference/ \ $OPM_DATA_ROOT/norne/opm-simulation-reference/ \
NORNE_ATW2013 \ NORNE_ATW2013 \
EGRID INIT EGRID INIT
@ -88,7 +88,7 @@ for test_name in ${tests}; do
if grep -q "norne_full" <<< $test_name if grep -q "norne_full" <<< $test_name
then then
copyToReferenceDir \ copyToReferenceDir \
deps/opm-data/norne/flow/ \ deps/opm-data/norne/flow_legacy/ \
$OPM_DATA_ROOT/norne/opm-simulation-reference/ \ $OPM_DATA_ROOT/norne/opm-simulation-reference/ \
NORNE_ATW2013 \ NORNE_ATW2013 \
UNSMRY UNSMRY