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: do not abuse TEST_ARGS in restart test machinery

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-09 11:19:50 +01:00
parent f24c8a3b2f
commit b10eb2dac1
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compareECLFiles.cmake
View File

@ -58,7 +58,6 @@ function(add_test_compare_restarted_simulation)
cmake_parse_arguments(PARAM "$" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) cmake_parse_arguments(PARAM "$" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
set(RESULT_PATH ${BASE_RESULT_PATH}/restart/${PARAM_SIMULATOR}+${PARAM_CASENAME}) set(RESULT_PATH ${BASE_RESULT_PATH}/restart/${PARAM_SIMULATOR}+${PARAM_CASENAME})
set(TEST_ARGS ${OPM_TESTS_ROOT}/${PARAM_CASENAME}/${PARAM_FILENAME} ${PARAM_TEST_ARGS})
opm_add_test(compareRestartedSim_${PARAM_SIMULATOR}+${PARAM_FILENAME} NO_COMPILE opm_add_test(compareRestartedSim_${PARAM_SIMULATOR}+${PARAM_FILENAME} NO_COMPILE
EXE_NAME ${PARAM_SIMULATOR} EXE_NAME ${PARAM_SIMULATOR}
@ -69,7 +68,7 @@ function(add_test_compare_restarted_simulation)
${COMPARE_ECL_COMMAND} ${COMPARE_ECL_COMMAND}
${OPM_PACK_COMMAND} ${OPM_PACK_COMMAND}
0 0
TEST_ARGS ${TEST_ARGS}) TEST_ARGS ${PARAM_TEST_ARGS})
endfunction() endfunction()
########################################################################### ###########################################################################
@ -124,7 +123,6 @@ function(add_test_compare_parallel_restarted_simulation)
cmake_parse_arguments(PARAM "$" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) cmake_parse_arguments(PARAM "$" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
set(RESULT_PATH ${BASE_RESULT_PATH}/parallelRestart/${PARAM_SIMULATOR}+${PARAM_CASENAME}) set(RESULT_PATH ${BASE_RESULT_PATH}/parallelRestart/${PARAM_SIMULATOR}+${PARAM_CASENAME})
set(TEST_ARGS ${OPM_TESTS_ROOT}/${PARAM_CASENAME}/${PARAM_FILENAME} ${PARAM_TEST_ARGS})
opm_add_test(compareParallelRestartedSim_${PARAM_SIMULATOR}+${PARAM_FILENAME} NO_COMPILE opm_add_test(compareParallelRestartedSim_${PARAM_SIMULATOR}+${PARAM_FILENAME} NO_COMPILE
EXE_NAME ${PARAM_SIMULATOR} EXE_NAME ${PARAM_SIMULATOR}
@ -135,7 +133,7 @@ function(add_test_compare_parallel_restarted_simulation)
${COMPARE_ECL_COMMAND} ${COMPARE_ECL_COMMAND}
${OPM_PACK_COMMAND} ${OPM_PACK_COMMAND}
1 1
TEST_ARGS ${TEST_ARGS}) TEST_ARGS ${PARAM_TEST_ARGS})
set_tests_properties(compareParallelRestartedSim_${PARAM_SIMULATOR}+${PARAM_FILENAME} set_tests_properties(compareParallelRestartedSim_${PARAM_SIMULATOR}+${PARAM_FILENAME}
PROPERTIES RUN_SERIAL 1) PROPERTIES RUN_SERIAL 1)
endfunction() endfunction()

8
tests/run-restart-regressionTest.sh
View File

@ -17,7 +17,7 @@ EXE_NAME="${10}"
shift 10 shift 10
TEST_ARGS="$@" TEST_ARGS="$@"
BASE_NAME=`basename ${TEST_ARGS}_RESTART.DATA` BASE_NAME=${FILENAME}_RESTART.DATA
rm -Rf ${RESULT_PATH} rm -Rf ${RESULT_PATH}
mkdir -p ${RESULT_PATH} mkdir -p ${RESULT_PATH}
@ -28,13 +28,13 @@ then
else else
CMD_PREFIX="" CMD_PREFIX=""
fi fi
${CMD_PREFIX} ${BINPATH}/${EXE_NAME} ${TEST_ARGS}.DATA --enable-adaptive-time-stepping=false --output-dir=${RESULT_PATH} ${CMD_PREFIX} ${BINPATH}/${EXE_NAME} ${INPUT_DATA_PATH}/${FILENAME} --enable-adaptive-time-stepping=false --output-dir=${RESULT_PATH} ${TEST_ARGS}
test $? -eq 0 || exit 1 test $? -eq 0 || exit 1
${OPM_PACK_COMMAND} -o ${BASE_NAME} ${TEST_ARGS}_RESTART.DATA ${OPM_PACK_COMMAND} -o ${BASE_NAME} ${INPUT_DATA_PATH}/${FILENAME}_RESTART.DATA
${CMD_PREFIX} ${BINPATH}/${EXE_NAME} ${BASE_NAME} --enable-adaptive-time-stepping=false --output-dir=${RESULT_PATH} ${CMD_PREFIX} ${BINPATH}/${EXE_NAME} ${BASE_NAME} --enable-adaptive-time-stepping=false --output-dir=${RESULT_PATH} ${TEST_ARGS}
test $? -eq 0 || exit 1 test $? -eq 0 || exit 1
ecode=0 ecode=0