mirror of
https://github.com/OPM/opm-simulators.git
synced 2024-12-01 21:39:09 -06:00
Merge pull request #3714 from joakim-hove/restart-rst-testing
Create CASE_RESTART deck on the fly when restart testing
This commit is contained in:
Joakim Hove
GitHub
commit
e7b6a6558b
@ -92,7 +92,7 @@ endfunction()
|
||||
# - This test class compares the output from a restarted simulation
|
||||
# to that of a non-restarted simulation.
|
||||
function(add_test_compare_restarted_simulation)
|
||||
set(oneValueArgs CASENAME FILENAME SIMULATOR TEST_NAME ABS_TOL REL_TOL DIR)
|
||||
set(oneValueArgs CASENAME FILENAME SIMULATOR TEST_NAME ABS_TOL REL_TOL DIR RESTART_STEP)
|
||||
set(multiValueArgs TEST_ARGS)
|
||||
cmake_parse_arguments(PARAM "$" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
|
||||
if(NOT PARAM_DIR)
|
||||
@ -114,7 +114,8 @@ function(add_test_compare_restarted_simulation)
|
||||
-a ${PARAM_ABS_TOL}
|
||||
-t ${PARAM_REL_TOL}
|
||||
-c ${COMPARE_ECL_COMMAND}
|
||||
-p ${OPM_PACK_COMMAND}
|
||||
-d ${RST_DECK_COMMAND}
|
||||
-s ${PARAM_RESTART_STEP}
|
||||
TEST_ARGS ${PARAM_TEST_ARGS})
|
||||
endfunction()
|
||||
|
||||
@ -167,7 +168,7 @@ endfunction()
|
||||
# - 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 DIR MPI_PROCS)
|
||||
set(oneValueArgs CASENAME FILENAME SIMULATOR ABS_TOL REL_TOL DIR MPI_PROCS RESTART_STEP)
|
||||
set(multiValueArgs TEST_ARGS)
|
||||
cmake_parse_arguments(PARAM "$" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
|
||||
if(NOT PARAM_DIR)
|
||||
@ -181,7 +182,8 @@ function(add_test_compare_parallel_restarted_simulation)
|
||||
-a ${PARAM_ABS_TOL}
|
||||
-t ${PARAM_REL_TOL}
|
||||
-c ${COMPARE_ECL_COMMAND}
|
||||
-p ${OPM_PACK_COMMAND})
|
||||
-s ${PARAM_RESTART_STEP}
|
||||
-d ${RST_DECK_COMMAND})
|
||||
if(PARAM_MPI_PROCS)
|
||||
list(APPEND DRIVER_ARGS -n ${PARAM_MPI_PROCS})
|
||||
endif()
|
||||
@ -1027,12 +1029,15 @@ add_test_compare_restarted_simulation(CASENAME spe1
|
||||
SIMULATOR flow
|
||||
ABS_TOL ${abs_tol_restart}
|
||||
REL_TOL ${rel_tol_restart}
|
||||
RESTART_STEP 6
|
||||
TEST_ARGS --sched-restart=false)
|
||||
|
||||
add_test_compare_restarted_simulation(CASENAME spe9
|
||||
FILENAME SPE9_CP_SHORT
|
||||
SIMULATOR flow
|
||||
ABS_TOL ${abs_tol_restart}
|
||||
REL_TOL ${rel_tol_restart}
|
||||
RESTART_STEP 15
|
||||
TEST_ARGS --sched-restart=false)
|
||||
|
||||
add_test_compare_restarted_simulation(CASENAME ctaquifer_2d_oilwater
|
||||
@ -1041,6 +1046,7 @@ add_test_compare_restarted_simulation(CASENAME ctaquifer_2d_oilwater
|
||||
ABS_TOL ${abs_tol_restart}
|
||||
REL_TOL ${rel_tol_restart}
|
||||
DIR aquifer-oilwater
|
||||
RESTART_STEP 15
|
||||
TEST_ARGS --sched-restart=true)
|
||||
|
||||
add_test_compare_restarted_simulation(CASENAME fetkovich_2d
|
||||
@ -1048,6 +1054,7 @@ add_test_compare_restarted_simulation(CASENAME fetkovich_2d
|
||||
SIMULATOR flow
|
||||
ABS_TOL ${abs_tol_restart}
|
||||
REL_TOL ${rel_tol_restart}
|
||||
RESTART_STEP 30
|
||||
DIR aquifer-fetkovich
|
||||
TEST_ARGS --sched-restart=true)
|
||||
|
||||
@ -1056,6 +1063,7 @@ add_test_compare_restarted_simulation(CASENAME numerical_aquifer_3d_1aqu
|
||||
SIMULATOR flow
|
||||
ABS_TOL ${abs_tol_restart}
|
||||
REL_TOL ${rel_tol_restart}
|
||||
RESTART_STEP 3
|
||||
DIR aquifer-num
|
||||
TEST_ARGS --sched-restart=true --enable-tuning=true)
|
||||
|
||||
@ -1064,6 +1072,7 @@ add_test_compare_restarted_simulation(CASENAME numerical_aquifer_3d_2aqu
|
||||
SIMULATOR flow
|
||||
ABS_TOL 0.4
|
||||
REL_TOL 4.0e-3
|
||||
RESTART_STEP 3
|
||||
DIR aquifer-num
|
||||
TEST_ARGS --sched-restart=true --enable-tuning=true)
|
||||
|
||||
@ -1079,6 +1088,7 @@ add_test_compare_restarted_simulation(CASENAME msw_3d_hfa
|
||||
SIMULATOR flow
|
||||
ABS_TOL ${abs_tol_restart_msw}
|
||||
REL_TOL ${rel_tol_restart_msw}
|
||||
RESTART_STEP 10
|
||||
TEST_ARGS --enable-adaptive-time-stepping=false --sched-restart=true)
|
||||
|
||||
|
||||
@ -1092,6 +1102,7 @@ add_test_compare_restarted_simulation(CASENAME spe1
|
||||
TEST_NAME restart_spe1_summary
|
||||
ABS_TOL ${abs_tol_restart}
|
||||
REL_TOL ${rel_tol_restart}
|
||||
RESTART_STEP 6
|
||||
TEST_ARGS --sched-restart=false)
|
||||
|
||||
|
||||
@ -1131,6 +1142,7 @@ if(MPI_FOUND)
|
||||
SIMULATOR flow
|
||||
ABS_TOL ${abs_tol_restart}
|
||||
REL_TOL ${rel_tol_restart}
|
||||
RESTART_STEP 6
|
||||
TEST_ARGS --sched-restart=false)
|
||||
|
||||
add_test_compare_parallel_restarted_simulation(CASENAME ctaquifer_2d_oilwater
|
||||
@ -1138,6 +1150,7 @@ if(MPI_FOUND)
|
||||
SIMULATOR flow
|
||||
ABS_TOL ${abs_tol_restart}
|
||||
REL_TOL ${rel_tol_restart}
|
||||
RESTART_STEP 15
|
||||
DIR aquifer-oilwater
|
||||
TEST_ARGS --enable-tuning=true --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-6)
|
||||
|
||||
@ -1146,6 +1159,7 @@ if(MPI_FOUND)
|
||||
SIMULATOR flow
|
||||
ABS_TOL ${abs_tol_restart}
|
||||
REL_TOL ${rel_tol_restart}
|
||||
RESTART_STEP 30
|
||||
DIR aquifer-fetkovich
|
||||
TEST_ARGS --enable-tuning=true --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-6)
|
||||
|
||||
@ -1154,6 +1168,7 @@ if(MPI_FOUND)
|
||||
SIMULATOR flow
|
||||
ABS_TOL 0.12
|
||||
REL_TOL 5.0e-2
|
||||
RESTART_STEP 3
|
||||
DIR aquifer-num
|
||||
TEST_ARGS --enable-tuning=true --tolerance-cnv=0.00003 --time-step-control=pid --linsolver=cpr)
|
||||
|
||||
@ -1162,6 +1177,7 @@ if(MPI_FOUND)
|
||||
SIMULATOR flow
|
||||
ABS_TOL 0.12
|
||||
REL_TOL 5.0e-2
|
||||
RESTART_STEP 3
|
||||
DIR aquifer-num
|
||||
TEST_ARGS --enable-tuning=true --tolerance-cnv=0.00003 --time-step-control=pid --linsolver=cpr)
|
||||
|
||||
|
||||
@ -15,8 +15,9 @@ then
|
||||
echo -e "\t\t -a <tol> Absolute tolerance in comparison"
|
||||
echo -e "\t\t -t <tol> Relative tolerance in comparison"
|
||||
echo -e "\t\t -c <path> Path to comparison tool"
|
||||
echo -e "\t\t -p <path> Path to deck packing tool"
|
||||
echo -e "\t\t -e <filename> Simulator binary to use"
|
||||
echo -e "\t\t -s <step> Step to do restart testing from"
|
||||
echo -e "\t\t -d <path> Path to restart deck tool"
|
||||
echo -e "\tOptional options:"
|
||||
echo -e "\t\t -n <procs> Number of MPI processes to use"
|
||||
exit 1
|
||||
@ -24,7 +25,7 @@ fi
|
||||
|
||||
MPI_PROCS=4
|
||||
OPTIND=1
|
||||
while getopts "i:r:b:f:a:t:c:p:e:n:" OPT
|
||||
while getopts "i:r:b:f:a:t:c:e:n:d:s:" OPT
|
||||
do
|
||||
case "${OPT}" in
|
||||
i) INPUT_DATA_PATH=${OPTARG} ;;
|
||||
@ -34,7 +35,8 @@ do
|
||||
a) ABS_TOL=${OPTARG} ;;
|
||||
t) REL_TOL=${OPTARG} ;;
|
||||
c) COMPARE_ECL_COMMAND=${OPTARG} ;;
|
||||
p) OPM_PACK_COMMAND=${OPTARG} ;;
|
||||
d) RST_DECK_COMMAND=${OPTARG} ;;
|
||||
s) RESTART_STEP=${OPTARG} ;;
|
||||
e) EXE_NAME=${OPTARG} ;;
|
||||
n) MPI_PROCS=${OPTARG} ;;
|
||||
esac
|
||||
@ -42,7 +44,7 @@ done
|
||||
shift $(($OPTIND-1))
|
||||
TEST_ARGS="$@"
|
||||
|
||||
BASE_NAME=${FILENAME}_RESTART.DATA
|
||||
BASE_NAME=${FILENAME}_RESTART
|
||||
|
||||
rm -Rf ${RESULT_PATH}
|
||||
mkdir -p ${RESULT_PATH}
|
||||
@ -51,7 +53,7 @@ mpirun -np ${MPI_PROCS} ${BINPATH}/${EXE_NAME} ${INPUT_DATA_PATH}/${FILENAME} --
|
||||
|
||||
test $? -eq 0 || exit 1
|
||||
|
||||
${OPM_PACK_COMMAND} -o ${BASE_NAME} ${INPUT_DATA_PATH}/${FILENAME}_RESTART.DATA
|
||||
${RST_DECK_COMMAND} ${INPUT_DATA_PATH}/${FILENAME}.DATA ${FILENAME}.UNRST:${RESTART_STEP} ${BASE_NAME}.DATA -m inline -s
|
||||
|
||||
mpirun -np ${MPI_PROCS} ${BINPATH}/${EXE_NAME} ${BASE_NAME} --enable-adaptive-time-stepping=false --output-dir=${RESULT_PATH} ${TEST_ARGS}
|
||||
test $? -eq 0 || exit 1
|
||||
|
||||
@ -15,13 +15,14 @@ then
|
||||
echo -e "\t\t -a <tol> Absolute tolerance in comparison"
|
||||
echo -e "\t\t -t <tol> Relative tolerance in comparison"
|
||||
echo -e "\t\t -c <path> Path to comparison tool"
|
||||
echo -e "\t\t -p <path> Path to deck packing tool"
|
||||
echo -e "\t\t -d <path> Path to restart deck tool"
|
||||
echo -e "\t\t -e <filename> Simulator binary to use"
|
||||
echo -e "\t\t -s <step> Step to do restart testing from"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
OPTIND=1
|
||||
while getopts "i:r:b:f:a:t:c:p:e:" OPT
|
||||
while getopts "i:r:b:f:a:t:c:e:d:s:" OPT
|
||||
do
|
||||
case "${OPT}" in
|
||||
i) INPUT_DATA_PATH=${OPTARG} ;;
|
||||
@ -31,14 +32,15 @@ do
|
||||
a) ABS_TOL=${OPTARG} ;;
|
||||
t) REL_TOL=${OPTARG} ;;
|
||||
c) COMPARE_ECL_COMMAND=${OPTARG} ;;
|
||||
p) OPM_PACK_COMMAND=${OPTARG} ;;
|
||||
d) RST_DECK_COMMAND=${OPTARG} ;;
|
||||
s) RESTART_STEP=${OPTARG} ;;
|
||||
e) EXE_NAME=${OPTARG} ;;
|
||||
esac
|
||||
done
|
||||
shift $(($OPTIND-1))
|
||||
TEST_ARGS="$@"
|
||||
|
||||
BASE_NAME=${FILENAME}_RESTART.DATA
|
||||
BASE_NAME=${FILENAME}_RESTART
|
||||
|
||||
rm -Rf ${RESULT_PATH}
|
||||
mkdir -p ${RESULT_PATH}
|
||||
@ -47,7 +49,7 @@ ${BINPATH}/${EXE_NAME} ${INPUT_DATA_PATH}/${FILENAME} --output-dir=${RESULT_PATH
|
||||
|
||||
test $? -eq 0 || exit 1
|
||||
|
||||
${OPM_PACK_COMMAND} -o ${BASE_NAME} ${INPUT_DATA_PATH}/${FILENAME}_RESTART.DATA
|
||||
${RST_DECK_COMMAND} ${INPUT_DATA_PATH}/${FILENAME}.DATA ${FILENAME}.UNRST:${RESTART_STEP} ${BASE_NAME}.DATA -m inline -s
|
||||
|
||||
${BINPATH}/${EXE_NAME} ${BASE_NAME} --output-dir=${RESULT_PATH} ${TEST_ARGS}
|
||||
test $? -eq 0 || exit 1
|
||||
|
||||
@ -17,13 +17,14 @@ then
|
||||
echo -e "\t\t -a <tol> Absolute tolerance in comparison"
|
||||
echo -e "\t\t -t <tol> Relative tolerance in comparison"
|
||||
echo -e "\t\t -c <path> Path to comparison tool"
|
||||
echo -e "\t\t -p <path> Path to deck packing tool"
|
||||
echo -e "\t\t -d <path> Path to restart deck tool"
|
||||
echo -e "\t\t -e <filename> Simulator binary to use"
|
||||
echo -e "\t\t -s <step> Step to do restart testing from"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
OPTIND=1
|
||||
while getopts "i:r:b:f:a:t:c:p:e:" OPT
|
||||
while getopts "i:r:b:f:a:t:c:e:d:s:" OPT
|
||||
do
|
||||
case "${OPT}" in
|
||||
i) INPUT_DATA_PATH=${OPTARG} ;;
|
||||
@ -33,14 +34,15 @@ do
|
||||
a) ABS_TOL=${OPTARG} ;;
|
||||
t) REL_TOL=${OPTARG} ;;
|
||||
c) COMPARE_ECL_COMMAND=${OPTARG} ;;
|
||||
p) OPM_PACK_COMMAND=${OPTARG} ;;
|
||||
d) RST_DECK_COMMAND=${OPTARG} ;;
|
||||
s) RESTART_STEP=${OPTARG} ;;
|
||||
e) EXE_NAME=${OPTARG} ;;
|
||||
esac
|
||||
done
|
||||
shift $(($OPTIND-1))
|
||||
TEST_ARGS="$@"
|
||||
|
||||
BASE_NAME=${FILENAME}_RESTART.DATA
|
||||
BASE_NAME=${FILENAME}_RESTART
|
||||
|
||||
rm -Rf ${RESULT_PATH}
|
||||
mkdir -p ${RESULT_PATH}
|
||||
@ -49,7 +51,7 @@ ${BINPATH}/${EXE_NAME} ${INPUT_DATA_PATH}/${FILENAME} --output-dir=${RESULT_PATH
|
||||
|
||||
test $? -eq 0 || exit 1
|
||||
|
||||
${OPM_PACK_COMMAND} -o ${BASE_NAME} ${INPUT_DATA_PATH}/${FILENAME}_RESTART.DATA
|
||||
${RST_DECK_COMMAND} ${INPUT_DATA_PATH}/${FILENAME}.DATA ${FILENAME}.UNRST:${RESTART_STEP} ${BASE_NAME}.DATA -m inline -s
|
||||
|
||||
${BINPATH}/${EXE_NAME} ${BASE_NAME} --output-dir=${RESULT_PATH} ${TEST_ARGS}
|
||||
test $? -eq 0 || exit 1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user