From 6f7042801ad099e3afa7ebf5528101ce98b14bc5 Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Tue, 30 Nov 2021 09:41:08 +0100 Subject: [PATCH] Remove references to opm-pack in restart testing --- compareECLFiles.cmake | 4 +--- tests/run-parallel-restart-regressionTest.sh | 4 +--- tests/run-restart-regressionTest.sh | 4 +--- tests/run-summary-restart-regressionTest.sh | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/compareECLFiles.cmake b/compareECLFiles.cmake index 7ac1bad63..c1959f11b 100755 --- a/compareECLFiles.cmake +++ b/compareECLFiles.cmake @@ -114,7 +114,6 @@ 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}) @@ -184,8 +183,7 @@ function(add_test_compare_parallel_restarted_simulation) -t ${PARAM_REL_TOL} -c ${COMPARE_ECL_COMMAND} -s ${PARAM_RESTART_STEP} - -d ${RST_DECK_COMMAND} - -p ${OPM_PACK_COMMAND}) + -d ${RST_DECK_COMMAND}) if(PARAM_MPI_PROCS) list(APPEND DRIVER_ARGS -n ${PARAM_MPI_PROCS}) endif() diff --git a/tests/run-parallel-restart-regressionTest.sh b/tests/run-parallel-restart-regressionTest.sh index 15b96c418..c1cfbb68e 100755 --- a/tests/run-parallel-restart-regressionTest.sh +++ b/tests/run-parallel-restart-regressionTest.sh @@ -15,7 +15,6 @@ then echo -e "\t\t -a Absolute tolerance in comparison" echo -e "\t\t -t Relative tolerance in comparison" echo -e "\t\t -c Path to comparison tool" - echo -e "\t\t -p Path to deck packing tool" echo -e "\t\t -e Simulator binary to use" echo -e "\t\t -s Step to do restart testing from" echo -e "\t\t -d Path to restart deck tool" @@ -26,7 +25,7 @@ fi MPI_PROCS=4 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 case "${OPT}" in i) INPUT_DATA_PATH=${OPTARG} ;; @@ -36,7 +35,6 @@ 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} ;; diff --git a/tests/run-restart-regressionTest.sh b/tests/run-restart-regressionTest.sh index 66c2607ed..7fad3299d 100755 --- a/tests/run-restart-regressionTest.sh +++ b/tests/run-restart-regressionTest.sh @@ -15,7 +15,6 @@ then echo -e "\t\t -a Absolute tolerance in comparison" echo -e "\t\t -t Relative tolerance in comparison" echo -e "\t\t -c Path to comparison tool" - echo -e "\t\t -p Path to deck packing tool" echo -e "\t\t -d Path to restart deck tool" echo -e "\t\t -e Simulator binary to use" echo -e "\t\t -s Step to do restart testing from" @@ -23,7 +22,7 @@ then fi 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 case "${OPT}" in i) INPUT_DATA_PATH=${OPTARG} ;; @@ -34,7 +33,6 @@ do t) REL_TOL=${OPTARG} ;; c) COMPARE_ECL_COMMAND=${OPTARG} ;; d) RST_DECK_COMMAND=${OPTARG} ;; - p) OPM_PACK_COMMAND=${OPTARG} ;; s) RESTART_STEP=${OPTARG} ;; e) EXE_NAME=${OPTARG} ;; esac diff --git a/tests/run-summary-restart-regressionTest.sh b/tests/run-summary-restart-regressionTest.sh index 647992202..f1c102379 100755 --- a/tests/run-summary-restart-regressionTest.sh +++ b/tests/run-summary-restart-regressionTest.sh @@ -17,7 +17,6 @@ then echo -e "\t\t -a Absolute tolerance in comparison" echo -e "\t\t -t Relative tolerance in comparison" echo -e "\t\t -c Path to comparison tool" - echo -e "\t\t -p Path to deck packing tool" echo -e "\t\t -d Path to restart deck tool" echo -e "\t\t -e Simulator binary to use" echo -e "\t\t -s Step to do restart testing from" @@ -25,7 +24,7 @@ then fi 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 case "${OPT}" in i) INPUT_DATA_PATH=${OPTARG} ;; @@ -36,7 +35,6 @@ do t) REL_TOL=${OPTARG} ;; c) COMPARE_ECL_COMMAND=${OPTARG} ;; d) RST_DECK_COMMAND=${OPTARG} ;; - p) OPM_PACK_COMMAND=${OPTARG} ;; s) RESTART_STEP=${OPTARG} ;; e) EXE_NAME=${OPTARG} ;; esac