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

fixed: print correct command at end of update helper

Browse Source 
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
This commit is contained in:
Arne Morten Kvarving 2017-01-17 10:48:47 +01:00
parent 0466d71d15
commit ea06f12d25
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/update_helper.sh
View File

@ -117,7 +117,7 @@ echo " "
echo " " echo " "
echo ">>> To update opm-data, please use the following command <<<" echo ">>> To update opm-data, please use the following command <<<"
echo " " 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 " "
echo ">>> To plot difference between new and old data, usse the following <<<" echo ">>> To plot difference between new and old data, usse the following <<<"

9
tests/update_reference_data.sh
View File

@ -14,7 +14,7 @@ copyToReferenceDir () {
FILETYPES=${@:4}; FILETYPES=${@:4};
for filetype in $FILETYPES; do for filetype in $FILETYPES; do
cp "$SRC_DIR$STEM.$filetype" $DST_DIR echo cp "$WORKSPACE/$SRC_DIR$STEM.$filetype" $DST_DIR
done done
} }
@ -37,7 +37,7 @@ for test_name in ${@:2}; do
EGRID INIT SMSPEC UNRST UNSMRY EGRID INIT SMSPEC UNRST UNSMRY
fi fi
if grep -q "spe3" <<< $2 if grep -q "spe3" <<< $test_name
then then
copyToReferenceDir \ copyToReferenceDir \
$configuration/build-opm-simulators/tests/results/flow_sequential+spe3/ \ $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 EGRID INIT PRT SMSPEC UNRST UNSMRY
fi fi
if grep -q "spe9" <<< $2 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+spe9/ \
@ -61,7 +61,8 @@ done
echo -e "update reference data for ${@:2}\n" > /tmp/cmsg 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 do
pushd $WORKSPACE/deps/$dep > /dev/null pushd $WORKSPACE/deps/$dep > /dev/null
name=`printf "%-14s" $dep` name=`printf "%-14s" $dep`