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

add support for parallel restart tests

Browse Source
This commit is contained in:
Arne Morten Kvarving 2018-01-04 13:48:43 +01:00
parent 0e6fe26a61
commit 6704ae0bb8
2 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
compareECLFiles.cmake
View File

@ -69,6 +69,7 @@ function(add_test_compare_restarted_simulation)
${PARAM_ABS_TOL} ${PARAM_REL_TOL} ${PARAM_ABS_TOL} ${PARAM_REL_TOL}
${COMPARE_SUMMARY_COMMAND} ${COMPARE_SUMMARY_COMMAND}
${COMPARE_ECL_COMMAND} ${COMPARE_ECL_COMMAND}
0
TEST_ARGS ${TEST_ARGS}) TEST_ARGS ${TEST_ARGS})
endfunction() endfunction()
@ -102,6 +103,37 @@ function(add_test_compare_parallel_simulation)
TEST_ARGS ${TEST_ARGS}) TEST_ARGS ${TEST_ARGS})
endfunction() endfunction()
###########################################################################
# TEST: add_test_compare_parallel_restarted_simulation
###########################################################################
# Input:
# - casename: basename (no extension)
#
# Details:
# - This test class compares the output from a restarted parallel simulation
# to that of a non-restarted parallel simulation.
function(add_test_compare_parallel_restarted_simulation)
set(oneValueArgs CASENAME FILENAME SIMULATOR ABS_TOL REL_TOL)
set(multiValueArgs TEST_ARGS)
cmake_parse_arguments(PARAM "$" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
set(RESULT_PATH ${BASE_RESULT_PATH}/restart/${PARAM_SIMULATOR}+${PARAM_CASENAME})
set(TEST_ARGS ${OPM_DATA_ROOT}/${PARAM_CASENAME}/${PARAM_FILENAME} ${PARAM_TEST_ARGS})
opm_add_test(compareParallelRestartedSim_${PARAM_SIMULATOR}+${PARAM_FILENAME} NO_COMPILE
EXE_NAME ${PARAM_SIMULATOR}
DRIVER_ARGS ${OPM_DATA_ROOT}/${PARAM_CASENAME} ${RESULT_PATH}
${CMAKE_BINARY_DIR}/bin
${PARAM_FILENAME}
${PARAM_ABS_TOL} ${PARAM_REL_TOL}
${COMPARE_SUMMARY_COMMAND}
${COMPARE_ECL_COMMAND}
1
TEST_ARGS ${TEST_ARGS})
endfunction()
if(NOT TARGET test-suite) if(NOT TARGET test-suite)
add_custom_target(test-suite) add_custom_target(test-suite)
endif() endif()

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

@ -12,16 +12,23 @@ ABS_TOL="$5"
REL_TOL="$6" REL_TOL="$6"
COMPARE_SUMMARY_COMMAND="$7" COMPARE_SUMMARY_COMMAND="$7"
COMPARE_ECL_COMMAND="$8" COMPARE_ECL_COMMAND="$8"
EXE_NAME="${9}" PARALLEL="${9}"
shift 9 EXE_NAME="${10}"
shift 10
TEST_ARGS="$@" TEST_ARGS="$@"
rm -Rf ${RESULT_PATH} rm -Rf ${RESULT_PATH}
mkdir -p ${RESULT_PATH} mkdir -p ${RESULT_PATH}
cd ${RESULT_PATH} cd ${RESULT_PATH}
${BINPATH}/${EXE_NAME} ${TEST_ARGS}.DATA timestep.adaptive=false output_dir=${RESULT_PATH} if test $PARALLEL -eq 1
then
CMD_PREFIX="mpirun -np 4 "
else
CMD_PREFIX=""
fi
${CMD_PREFIX} ${BINPATH}/${EXE_NAME} ${TEST_ARGS}.DATA timestep.adaptive=false output_dir=${RESULT_PATH}
test $? -eq 0 || exit 1 test $? -eq 0 || exit 1
${BINPATH}/${EXE_NAME} ${TEST_ARGS}_RESTART.DATA timestep.adaptive=false output_dir=${RESULT_PATH} ${CMD_PREFIX} ${BINPATH}/${EXE_NAME} ${TEST_ARGS}_RESTART.DATA timestep.adaptive=false output_dir=${RESULT_PATH}
test $? -eq 0 || exit 1 test $? -eq 0 || exit 1
ecode=0 ecode=0