From ea06f12d25ce14f25ec5d80f9135461f5bd25d73 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Tue, 17 Jan 2017 10:48:47 +0100 Subject: [PATCH] fixed: print correct command at end of update helper do not point user to deps/opm-data, use the user-supplied directory. also add missing ewoms hash to output, consistently use $WORKSPACE everywhere and correct variable used for spe3|spe9 in data update loop --- tests/update_helper.sh | 2 +- tests/update_reference_data.sh | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/update_helper.sh b/tests/update_helper.sh index 898cef7b7..daeb5e6cd 100755 --- a/tests/update_helper.sh +++ b/tests/update_helper.sh @@ -117,7 +117,7 @@ echo " " echo " " echo ">>> To update opm-data, please use the following command <<<" echo " " -echo "configuration=serial WORKSPACE=$WORKSPACE $SCRIPT_PATH/update_reference_data.sh $WORKSPACE/deps/opm-data [spe11] [spe12] [spe3] [spe9]" +echo "configuration=serial WORKSPACE=$WORKSPACE $SCRIPT_PATH/update_reference_data.sh $OPM_DATA_ROOT [spe11] [spe12] [spe3] [spe9]" echo " " echo ">>> To plot difference between new and old data, usse the following <<<" diff --git a/tests/update_reference_data.sh b/tests/update_reference_data.sh index 9234dffbf..625f2ee9b 100755 --- a/tests/update_reference_data.sh +++ b/tests/update_reference_data.sh @@ -14,7 +14,7 @@ copyToReferenceDir () { FILETYPES=${@:4}; for filetype in $FILETYPES; do - cp "$SRC_DIR$STEM.$filetype" $DST_DIR + echo cp "$WORKSPACE/$SRC_DIR$STEM.$filetype" $DST_DIR done } @@ -37,7 +37,7 @@ for test_name in ${@:2}; do EGRID INIT SMSPEC UNRST UNSMRY fi - if grep -q "spe3" <<< $2 + if grep -q "spe3" <<< $test_name then copyToReferenceDir \ $configuration/build-opm-simulators/tests/results/flow_sequential+spe3/ \ @@ -46,7 +46,7 @@ for test_name in ${@:2}; do EGRID INIT PRT SMSPEC UNRST UNSMRY fi - if grep -q "spe9" <<< $2 + if grep -q "spe9" <<< $test_name then copyToReferenceDir \ $configuration/build-opm-simulators/tests/results/flow+spe9/ \ @@ -61,7 +61,8 @@ done echo -e "update reference data for ${@:2}\n" > /tmp/cmsg -for dep in ert opm-common opm-core opm-grid opm-material opm-parser opm-output +echo -e "Reason: fill in this\n" >> /tmp/cmsg +for dep in ert opm-common opm-core opm-grid opm-material opm-parser opm-output ewoms do pushd $WORKSPACE/deps/$dep > /dev/null name=`printf "%-14s" $dep`