update scripts to use new paths for reference data

reference data paths have been updated to reflect simulator
data is for.
This commit is contained in:
Arne Morten Kvarving 2017-04-07 11:40:45 +02:00
parent 29f3b86ef0
commit 7bbb4a2a28
3 changed files with 14 additions and 14 deletions

View File

@ -25,11 +25,11 @@ ${BINPATH}/${EXE_NAME} ${TEST_ARGS} nosim=true output_dir=${RESULT_PATH}
cd ..
ecode=0
${COMPARE_ECL_COMMAND} -t INIT ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL}
${COMPARE_ECL_COMMAND} -t INIT ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL}
if [ $? -ne 0 ]
then
ecode=1
`dirname $0`/analyze_ecl_failure.sh ${COMPARE_ECL_COMMAND} INIT ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL}
`dirname $0`/analyze_ecl_failure.sh ${COMPARE_ECL_COMMAND} INIT ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL}
fi
exit $ecode

View File

@ -23,27 +23,27 @@ cd ..
ecode=0
echo "=== Executing comparison for summary file ==="
${COMPARE_SUMMARY_COMMAND} -r ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL}
${COMPARE_SUMMARY_COMMAND} -r ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL}
if [ $? -ne 0 ]
then
ecode=1
`dirname $0`/analyze_summary_failure.sh ${COMPARE_SUMMARY_COMMAND} -r ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL}
`dirname $0`/analyze_summary_failure.sh ${COMPARE_SUMMARY_COMMAND} -r ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL}
fi
echo "=== Executing comparison for restart file ==="
${COMPARE_ECL_COMMAND} ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL}
${COMPARE_ECL_COMMAND} ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL}
if [ $? -ne 0 ]
then
ecode=1
`dirname $0`/analyze_ecl_failure.sh ${COMPARE_ECL_COMMAND} UNRST ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL}
`dirname $0`/analyze_ecl_failure.sh ${COMPARE_ECL_COMMAND} UNRST ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL}
fi
echo "=== Executing comparison for init file ==="
${COMPARE_ECL_COMMAND} -t INIT ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL}
${COMPARE_ECL_COMMAND} -t INIT ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL}
if [ $? -ne 0 ]
then
ecode=1
`dirname $0`/analyze_ecl_failure.sh ${COMPARE_ECL_COMMAND} INIT ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL}
`dirname $0`/analyze_ecl_failure.sh ${COMPARE_ECL_COMMAND} INIT ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL}
fi
exit $ecode

View File

@ -44,7 +44,7 @@ for test_name in ${tests}; do
then
copyToReferenceDir \
$configuration/build-opm-simulators/tests/results/flow_legacy+spe1/ \
$OPM_DATA_ROOT/spe1/opm-simulation-reference/ \
$OPM_DATA_ROOT/spe1/opm-simulation-reference/flow_legacy \
SPE1CASE2 \
EGRID INIT SMSPEC UNRST UNSMRY
fi
@ -53,7 +53,7 @@ for test_name in ${tests}; do
then
copyToReferenceDir \
$configuration/build-opm-simulators/tests/results/flow_multisegment+msw_2d_h/ \
$OPM_DATA_ROOT/msw_2d_h/opm-simulation-reference/ \
$OPM_DATA_ROOT/msw_2d_h/opm-simulation-reference/flow_multisegment \
2D_H__ \
EGRID INIT SMSPEC UNRST UNSMRY
fi
@ -62,7 +62,7 @@ for test_name in ${tests}; do
then
copyToReferenceDir \
$configuration/build-opm-simulators/tests/results/flow_legacy+spe3/ \
$OPM_DATA_ROOT/spe3/opm-simulation-reference/ \
$OPM_DATA_ROOT/spe3/opm-simulation-reference/flow_legacy \
SPE3CASE1 \
EGRID INIT PRT SMSPEC UNRST UNSMRY
fi
@ -71,7 +71,7 @@ for test_name in ${tests}; do
then
copyToReferenceDir \
$configuration/build-opm-simulators/tests/results/flow_legacy+spe9/ \
$OPM_DATA_ROOT/spe9/opm-simulation-reference/ \
$OPM_DATA_ROOT/spe9/opm-simulation-reference/flow_legacy \
SPE9_CP_SHORT \
EGRID INIT PRT SMSPEC UNRST UNSMRY
fi
@ -80,7 +80,7 @@ for test_name in ${tests}; do
then
copyToReferenceDir \
$configuration/build-opm-simulators/tests/results/init/flow_legacy+norne/ \
$OPM_DATA_ROOT/norne/opm-simulation-reference/ \
$OPM_DATA_ROOT/norne/opm-simulation-reference/flow_legacy \
NORNE_ATW2013 \
EGRID INIT
fi
@ -89,7 +89,7 @@ for test_name in ${tests}; do
then
copyToReferenceDir \
deps/opm-data/norne/flow_legacy/ \
$OPM_DATA_ROOT/norne/opm-simulation-reference/ \
$OPM_DATA_ROOT/norne/opm-simulation-reference/flow_legacy \
NORNE_ATW2013 \
UNSMRY
fi