mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Merge pull request #3698 from joakim-hove/rename-restart
Suggestion: Rename restart case to ${CASE}_RESTART in regression test
This commit is contained in:
commit
2b0bce970c
@ -71,21 +71,21 @@ then
|
|||||||
echo "=== Executing restart run ==="
|
echo "=== Executing restart run ==="
|
||||||
mkdir -p ${RESULT_PATH}/restart
|
mkdir -p ${RESULT_PATH}/restart
|
||||||
cp -f ${RESULT_PATH}/${FILENAME}.UNRST ${RESULT_PATH}/restart
|
cp -f ${RESULT_PATH}/${FILENAME}.UNRST ${RESULT_PATH}/restart
|
||||||
${RST_DECK_COMMAND} ${INPUT_DATA_PATH}/${FILENAME}.DATA ${FILENAME}:${RESTART_STEP} -m inline -s > ${RESULT_PATH}/restart/${FILENAME}.DATA
|
${RST_DECK_COMMAND} ${INPUT_DATA_PATH}/${FILENAME}.DATA ${FILENAME}:${RESTART_STEP} -m inline -s > ${RESULT_PATH}/restart/${FILENAME}_RESTART.DATA
|
||||||
cd ${RESULT_PATH}/restart
|
cd ${RESULT_PATH}/restart
|
||||||
if test -n "$RESTART_SCHED"
|
if test -n "$RESTART_SCHED"
|
||||||
then
|
then
|
||||||
sched_rst="--sched-restart=${RESTART_SCHED}"
|
sched_rst="--sched-restart=${RESTART_SCHED}"
|
||||||
fi
|
fi
|
||||||
${BINPATH}/${EXE_NAME} ${TEST_ARGS} ${sched_rst} --output-dir=${RESULT_PATH}/restart ${FILENAME}
|
${BINPATH}/${EXE_NAME} ${TEST_ARGS} ${sched_rst} --output-dir=${RESULT_PATH}/restart ${FILENAME}_RESTART
|
||||||
test $? -eq 0 || exit 1
|
test $? -eq 0 || exit 1
|
||||||
|
|
||||||
echo "=== Executing comparison for EGRID, INIT, UNRST and RFT files for restarted run ==="
|
echo "=== Executing comparison for EGRID, INIT, UNRST and RFT files for restarted run ==="
|
||||||
${COMPARE_ECL_COMMAND} ${ignore_extra_kw} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/restart/${FILENAME} ${RESULT_PATH}/restart/${FILENAME} ${ABS_TOL} ${REL_TOL}
|
${COMPARE_ECL_COMMAND} ${ignore_extra_kw} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/restart/${FILENAME}_RESTART ${RESULT_PATH}/restart/${FILENAME}_RESTART ${ABS_TOL} ${REL_TOL}
|
||||||
if [ $? -ne 0 ]
|
if [ $? -ne 0 ]
|
||||||
then
|
then
|
||||||
ecode=1
|
ecode=1
|
||||||
${COMPARE_ECL_COMMAND} ${ignore_extra_kw} -a ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/restart/${FILENAME} ${RESULT_PATH}/restart/${FILENAME} ${ABS_TOL} ${REL_TOL}
|
${COMPARE_ECL_COMMAND} ${ignore_extra_kw} -a ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/restart/${FILENAME}_RESTART ${RESULT_PATH}/restart/${FILENAME}_RESTART ${ABS_TOL} ${REL_TOL}
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -200,7 +200,7 @@ do
|
|||||||
copyToReferenceDir \
|
copyToReferenceDir \
|
||||||
$BUILD_DIR/tests/results/$binary+$test_name/restart/ \
|
$BUILD_DIR/tests/results/$binary+$test_name/restart/ \
|
||||||
$OPM_TESTS_ROOT/$dirname/opm-simulation-reference/$binary/restart \
|
$OPM_TESTS_ROOT/$dirname/opm-simulation-reference/$binary/restart \
|
||||||
$casename \
|
${casename}_RESTART \
|
||||||
EGRID INIT RFT SMSPEC UNRST UNSMRY
|
EGRID INIT RFT SMSPEC UNRST UNSMRY
|
||||||
test $? -eq 0 && changed_tests="$changed_tests $test_name(restart)"
|
test $? -eq 0 && changed_tests="$changed_tests $test_name(restart)"
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user