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

Remove references to opm-pack in restart testing

Browse Source
This commit is contained in:
Joakim Hove 2021-11-30 09:41:08 +01:00
parent b46b83011a
commit 6f7042801a
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compareECLFiles.cmake
View File

@ -114,7 +114,6 @@ function(add_test_compare_restarted_simulation)
-a ${PARAM_ABS_TOL} -a ${PARAM_ABS_TOL}
-t ${PARAM_REL_TOL} -t ${PARAM_REL_TOL}
-c ${COMPARE_ECL_COMMAND} -c ${COMPARE_ECL_COMMAND}
-p ${OPM_PACK_COMMAND}
-d ${RST_DECK_COMMAND} -d ${RST_DECK_COMMAND}
-s ${PARAM_RESTART_STEP} -s ${PARAM_RESTART_STEP}
TEST_ARGS ${PARAM_TEST_ARGS}) TEST_ARGS ${PARAM_TEST_ARGS})
@ -184,8 +183,7 @@ function(add_test_compare_parallel_restarted_simulation)
-t ${PARAM_REL_TOL} -t ${PARAM_REL_TOL}
-c ${COMPARE_ECL_COMMAND} -c ${COMPARE_ECL_COMMAND}
-s ${PARAM_RESTART_STEP} -s ${PARAM_RESTART_STEP}
-d ${RST_DECK_COMMAND} -d ${RST_DECK_COMMAND})
-p ${OPM_PACK_COMMAND})
if(PARAM_MPI_PROCS) if(PARAM_MPI_PROCS)
list(APPEND DRIVER_ARGS -n ${PARAM_MPI_PROCS}) list(APPEND DRIVER_ARGS -n ${PARAM_MPI_PROCS})
endif() endif()

4
tests/run-parallel-restart-regressionTest.sh
View File

@ -15,7 +15,6 @@ then
echo -e "\t\t -a <tol> Absolute tolerance in comparison" echo -e "\t\t -a <tol> Absolute tolerance in comparison"
echo -e "\t\t -t <tol> Relative 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 -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 -e <filename> Simulator binary to use"
echo -e "\t\t -s <step> Step to do restart testing from" 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 "\t\t -d <path> Path to restart deck tool"
@ -26,7 +25,7 @@ fi
MPI_PROCS=4 MPI_PROCS=4
OPTIND=1 OPTIND=1
while getopts "i:r:b:f:a:t:c:p:e:n:d:s:" OPT while getopts "i:r:b:f:a:t:c:e:n:d:s:" OPT
do do
case "${OPT}" in case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;; i) INPUT_DATA_PATH=${OPTARG} ;;
@ -36,7 +35,6 @@ do
a) ABS_TOL=${OPTARG} ;; a) ABS_TOL=${OPTARG} ;;
t) REL_TOL=${OPTARG} ;; t) REL_TOL=${OPTARG} ;;
c) COMPARE_ECL_COMMAND=${OPTARG} ;; c) COMPARE_ECL_COMMAND=${OPTARG} ;;
p) OPM_PACK_COMMAND=${OPTARG} ;;
d) RST_DECK_COMMAND=${OPTARG} ;; d) RST_DECK_COMMAND=${OPTARG} ;;
s) RESTART_STEP=${OPTARG} ;; s) RESTART_STEP=${OPTARG} ;;
e) EXE_NAME=${OPTARG} ;; e) EXE_NAME=${OPTARG} ;;

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

@ -15,7 +15,6 @@ then
echo -e "\t\t -a <tol> Absolute tolerance in comparison" echo -e "\t\t -a <tol> Absolute tolerance in comparison"
echo -e "\t\t -t <tol> Relative 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 -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 -d <path> Path to restart deck tool"
echo -e "\t\t -e <filename> Simulator binary to use" 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 -s <step> Step to do restart testing from"
@ -23,7 +22,7 @@ then
fi fi
OPTIND=1 OPTIND=1
while getopts "i:r:b:f:a:t:c:p:e:d:s:" OPT while getopts "i:r:b:f:a:t:c:e:d:s:" OPT
do do
case "${OPT}" in case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;; i) INPUT_DATA_PATH=${OPTARG} ;;
@ -34,7 +33,6 @@ do
t) REL_TOL=${OPTARG} ;; t) REL_TOL=${OPTARG} ;;
c) COMPARE_ECL_COMMAND=${OPTARG} ;; c) COMPARE_ECL_COMMAND=${OPTARG} ;;
d) RST_DECK_COMMAND=${OPTARG} ;; d) RST_DECK_COMMAND=${OPTARG} ;;
p) OPM_PACK_COMMAND=${OPTARG} ;;
s) RESTART_STEP=${OPTARG} ;; s) RESTART_STEP=${OPTARG} ;;
e) EXE_NAME=${OPTARG} ;; e) EXE_NAME=${OPTARG} ;;
esac esac

4
tests/run-summary-restart-regressionTest.sh
View File

@ -17,7 +17,6 @@ then
echo -e "\t\t -a <tol> Absolute tolerance in comparison" echo -e "\t\t -a <tol> Absolute tolerance in comparison"
echo -e "\t\t -t <tol> Relative 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 -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 -d <path> Path to restart deck tool"
echo -e "\t\t -e <filename> Simulator binary to use" 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 -s <step> Step to do restart testing from"
@ -25,7 +24,7 @@ then
fi fi
OPTIND=1 OPTIND=1
while getopts "i:r:b:f:a:t:c:p:e:d:s:" OPT while getopts "i:r:b:f:a:t:c:e:d:s:" OPT
do do
case "${OPT}" in case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;; i) INPUT_DATA_PATH=${OPTARG} ;;
@ -36,7 +35,6 @@ do
t) REL_TOL=${OPTARG} ;; t) REL_TOL=${OPTARG} ;;
c) COMPARE_ECL_COMMAND=${OPTARG} ;; c) COMPARE_ECL_COMMAND=${OPTARG} ;;
d) RST_DECK_COMMAND=${OPTARG} ;; d) RST_DECK_COMMAND=${OPTARG} ;;
p) OPM_PACK_COMMAND=${OPTARG} ;;
s) RESTART_STEP=${OPTARG} ;; s) RESTART_STEP=${OPTARG} ;;
e) EXE_NAME=${OPTARG} ;; e) EXE_NAME=${OPTARG} ;;
esac esac