OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-13 09:22:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3604 from akva2/improve_test_drivers

Browse Source 
changed: use getopts in test drivers
This commit is contained in:
Bård Skaflestad authored and GitHub committed 2021-10-17 17:48:23 +02:00
2 parents 350875e7c5 673b049b9a
commit 09b7f287a0
11 files changed
+347 -134
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CMakeLists.txt
+6 -3
View File
@@ -293,7 +293,8 @@ opm_add_test(test_gatherconvergencereport
CONDITION CONDITION
MPI_FOUND AND Boost_UNIT_TEST_FRAMEWORK_FOUND MPI_FOUND AND Boost_UNIT_TEST_FRAMEWORK_FOUND
DRIVER_ARGS DRIVER_ARGS
4 ${PROJECT_BINARY_DIR} -n 4
-b ${PROJECT_BINARY_DIR}
) )
opm_add_test(test_gatherdeferredlogger opm_add_test(test_gatherdeferredlogger
@@ -304,7 +305,8 @@ opm_add_test(test_gatherdeferredlogger
CONDITION CONDITION
MPI_FOUND AND Boost_UNIT_TEST_FRAMEWORK_FOUND MPI_FOUND AND Boost_UNIT_TEST_FRAMEWORK_FOUND
DRIVER_ARGS DRIVER_ARGS
4 ${PROJECT_BINARY_DIR} -n 4
-b ${PROJECT_BINARY_DIR}
) )
opm_add_test(test_parallelwellinfo_mpi opm_add_test(test_parallelwellinfo_mpi
@@ -313,7 +315,8 @@ opm_add_test(test_parallelwellinfo_mpi
CONDITION CONDITION
MPI_FOUND AND Boost_UNIT_TEST_FRAMEWORK_FOUND MPI_FOUND AND Boost_UNIT_TEST_FRAMEWORK_FOUND
DRIVER_ARGS DRIVER_ARGS
4 ${PROJECT_BINARY_DIR} -n 4
-b ${PROJECT_BINARY_DIR}
NO_COMPILE NO_COMPILE
) )
compareECLFiles.cmake
+48 -39
View File
@@ -31,11 +31,11 @@ function(add_test_runSimulator)
set(TEST_ARGS ${PARAM_TEST_ARGS}) set(TEST_ARGS ${PARAM_TEST_ARGS})
opm_add_test(runSimulator/${PARAM_CASENAME} NO_COMPILE opm_add_test(runSimulator/${PARAM_CASENAME} NO_COMPILE
EXE_NAME ${PARAM_SIMULATOR} EXE_NAME ${PARAM_SIMULATOR}
DRIVER_ARGS ${OPM_TESTS_ROOT}/${PARAM_DIR} DRIVER_ARGS -i ${OPM_TESTS_ROOT}/${PARAM_DIR}
${RESULT_PATH} -r ${RESULT_PATH}
${PROJECT_BINARY_DIR}/bin -b ${PROJECT_BINARY_DIR}/bin
${PARAM_FILENAME} -f ${PARAM_FILENAME}
${PARAM_PROCS} -n ${PARAM_PROCS}
TEST_ARGS ${TEST_ARGS} TEST_ARGS ${TEST_ARGS}
CONFIGURATION extra) CONFIGURATION extra)
endfunction() endfunction()
@@ -59,26 +59,25 @@ function(add_test_compareECLFiles)
if(NOT PARAM_PREFIX) if(NOT PARAM_PREFIX)
set(PARAM_PREFIX compareECLFiles) set(PARAM_PREFIX compareECLFiles)
endif() endif()
if(NOT PARAM_RESTART_STEP)
set(PARAM_RESTART_STEP 0)
endif()
if(NOT DEFINED PARAM_RESTART_SCHED)
set(sched_restart "--")
else()
set(sched_restart "--sched-restart=${PARAM_RESTART_SCHED}")
endif()
set(RESULT_PATH ${BASE_RESULT_PATH}${PARAM_DIR_PREFIX}/${PARAM_SIMULATOR}+${PARAM_CASENAME}) set(RESULT_PATH ${BASE_RESULT_PATH}${PARAM_DIR_PREFIX}/${PARAM_SIMULATOR}+${PARAM_CASENAME})
set(TEST_ARGS ${PARAM_TEST_ARGS}) set(TEST_ARGS ${PARAM_TEST_ARGS})
set(DRIVER_ARGS -i ${OPM_TESTS_ROOT}/${PARAM_DIR}
-r ${RESULT_PATH}
-b ${PROJECT_BINARY_DIR}/bin
-f ${PARAM_FILENAME}
-a ${PARAM_ABS_TOL}
-t ${PARAM_REL_TOL}
-c ${COMPARE_ECL_COMMAND}
-d ${RST_DECK_COMMAND})
if(PARAM_RESTART_STEP)
list(APPEND DRIVER_ARGS -s ${PARAM_RESTART_STEP})
endif()
if(PARAM_RESTART_SCHED)
list(APPEND DRIVER_ARGS -h ${PARAM_RESTART_SCHED})
endif()
opm_add_test(${PARAM_PREFIX}_${PARAM_SIMULATOR}+${PARAM_FILENAME} NO_COMPILE opm_add_test(${PARAM_PREFIX}_${PARAM_SIMULATOR}+${PARAM_FILENAME} NO_COMPILE
EXE_NAME ${PARAM_SIMULATOR} EXE_NAME ${PARAM_SIMULATOR}
DRIVER_ARGS ${OPM_TESTS_ROOT}/${PARAM_DIR} ${RESULT_PATH} DRIVER_ARGS ${DRIVER_ARGS}
${PROJECT_BINARY_DIR}/bin
${PARAM_FILENAME}
${PARAM_ABS_TOL} ${PARAM_REL_TOL}
${COMPARE_ECL_COMMAND}
${RST_DECK_COMMAND}
${PARAM_RESTART_STEP}
${sched_restart}
TEST_ARGS ${TEST_ARGS}) TEST_ARGS ${TEST_ARGS})
endfunction() endfunction()
@@ -108,12 +107,14 @@ function(add_test_compare_restarted_simulation)
set(RESULT_PATH ${BASE_RESULT_PATH}/restart/${PARAM_SIMULATOR}+${PARAM_CASENAME}) set(RESULT_PATH ${BASE_RESULT_PATH}/restart/${PARAM_SIMULATOR}+${PARAM_CASENAME})
opm_add_test(${TEST_NAME} NO_COMPILE opm_add_test(${TEST_NAME} NO_COMPILE
EXE_NAME ${PARAM_SIMULATOR} EXE_NAME ${PARAM_SIMULATOR}
DRIVER_ARGS ${OPM_TESTS_ROOT}/${PARAM_DIR} ${RESULT_PATH} DRIVER_ARGS -i ${OPM_TESTS_ROOT}/${PARAM_DIR}
${PROJECT_BINARY_DIR}/bin -r ${RESULT_PATH}
${PARAM_FILENAME} -b ${PROJECT_BINARY_DIR}/bin
${PARAM_ABS_TOL} ${PARAM_REL_TOL} -f ${PARAM_FILENAME}
${COMPARE_ECL_COMMAND} -a ${PARAM_ABS_TOL}
${OPM_PACK_COMMAND} -t ${PARAM_REL_TOL}
-c ${COMPARE_ECL_COMMAND}
-p ${OPM_PACK_COMMAND}
TEST_ARGS ${PARAM_TEST_ARGS}) TEST_ARGS ${PARAM_TEST_ARGS})
endfunction() endfunction()
@@ -142,11 +143,13 @@ function(add_test_compare_parallel_simulation)
# Add test that runs flow_mpi and outputs the results to file # Add test that runs flow_mpi and outputs the results to file
opm_add_test(compareParallelSim_${PARAM_SIMULATOR}+${PARAM_FILENAME} NO_COMPILE opm_add_test(compareParallelSim_${PARAM_SIMULATOR}+${PARAM_FILENAME} NO_COMPILE
EXE_NAME ${PARAM_SIMULATOR} EXE_NAME ${PARAM_SIMULATOR}
DRIVER_ARGS ${OPM_TESTS_ROOT}/${PARAM_DIR} ${RESULT_PATH} DRIVER_ARGS -i ${OPM_TESTS_ROOT}/${PARAM_DIR}
${PROJECT_BINARY_DIR}/bin -r ${RESULT_PATH}
${PARAM_FILENAME} -b ${PROJECT_BINARY_DIR}/bin
${PARAM_ABS_TOL} ${PARAM_REL_TOL} -f ${PARAM_FILENAME}
${COMPARE_ECL_COMMAND} -a ${PARAM_ABS_TOL}
-t ${PARAM_REL_TOL}
-c ${COMPARE_ECL_COMMAND}
TEST_ARGS ${TEST_ARGS}) TEST_ARGS ${TEST_ARGS})
set_tests_properties(compareParallelSim_${PARAM_SIMULATOR}+${PARAM_FILENAME} set_tests_properties(compareParallelSim_${PARAM_SIMULATOR}+${PARAM_FILENAME}
PROPERTIES RUN_SERIAL 1) PROPERTIES RUN_SERIAL 1)
@@ -164,22 +167,28 @@ endfunction()
# - This test class compares the output from a restarted parallel simulation # - This test class compares the output from a restarted parallel simulation
# to that of a non-restarted parallel simulation. # to that of a non-restarted parallel simulation.
function(add_test_compare_parallel_restarted_simulation) function(add_test_compare_parallel_restarted_simulation)
set(oneValueArgs CASENAME FILENAME SIMULATOR ABS_TOL REL_TOL DIR) set(oneValueArgs CASENAME FILENAME SIMULATOR ABS_TOL REL_TOL DIR MPI_PROCS)
set(multiValueArgs TEST_ARGS) set(multiValueArgs TEST_ARGS)
cmake_parse_arguments(PARAM "$" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) cmake_parse_arguments(PARAM "$" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
if(NOT PARAM_DIR) if(NOT PARAM_DIR)
set(PARAM_DIR ${PARAM_CASENAME}) set(PARAM_DIR ${PARAM_CASENAME})
endif() endif()
set(RESULT_PATH ${BASE_RESULT_PATH}/parallelRestart/${PARAM_SIMULATOR}+${PARAM_CASENAME}) set(RESULT_PATH ${BASE_RESULT_PATH}/parallelRestart/${PARAM_SIMULATOR}+${PARAM_CASENAME})
set(DRIVER_ARGS -i ${OPM_TESTS_ROOT}/${PARAM_DIR}
-r ${RESULT_PATH}
-b ${PROJECT_BINARY_DIR}/bin
-f ${PARAM_FILENAME}
-a ${PARAM_ABS_TOL}
-t ${PARAM_REL_TOL}
-c ${COMPARE_ECL_COMMAND}
-p ${OPM_PACK_COMMAND})
if(PARAM_MPI_PROCS)
list(APPEND DRIVER_ARGS -n ${PARAM_MPI_PROCS})
endif()
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}
DRIVER_ARGS ${OPM_TESTS_ROOT}/${PARAM_DIR} ${RESULT_PATH} DRIVER_ARGS ${DRIVER_ARGS}
${PROJECT_BINARY_DIR}/bin
${PARAM_FILENAME}
${PARAM_ABS_TOL} ${PARAM_REL_TOL}
${COMPARE_ECL_COMMAND}
${OPM_PACK_COMMAND}
TEST_ARGS ${PARAM_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)
tests/run-init-regressionTest.sh
+32 -10
View File
@@ -6,16 +6,38 @@
# Useful for models that are too large to do simulation on # Useful for models that are too large to do simulation on
# as a regression test. # as a regression test.
INPUT_DATA_PATH="$1" if test $# -eq 0
RESULT_PATH="$2" then
BINPATH="$3" echo -e "Usage:\t$0 <options> -- [additional simulator options]"
FILENAME="$4" echo -e "\tMandatory options:"
ABS_TOL="$5" echo -e "\t\t -i <path> Path to read deck from"
REL_TOL="$6" echo -e "\t\t -r <path> Path to store results in"
COMPARE_ECL_COMMAND="$7" echo -e "\t\t -b <path> Path to simulator binary"
# param 8, 9 and 10 ignored, only used with regression tests echo -e "\t\t -f <filename> Deck file name"
EXE_NAME="${11}" echo -e "\t\t -a <tol> Absolute tolerance in comparison"
shift 11 echo -e "\t\t -t <tol> Relative tolerance in comparison"
echo -e "\t\t -c <path> Path to comparison tool"
echo -e "\t\t -e <filename> Simulator binary to use"
exit 1
fi
OPTIND=1
while getopts "i:r:b:f:a:t:c:e:d:h:" OPT
do
case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;;
r) RESULT_PATH=${OPTARG} ;;
b) BINPATH=${OPTARG} ;;
f) FILENAME=${OPTARG} ;;
a) ABS_TOL=${OPTARG} ;;
t) REL_TOL=${OPTARG} ;;
c) COMPARE_ECL_COMMAND=${OPTARG} ;;
e) EXE_NAME=${OPTARG} ;;
d) ;; # Ignored
h) ;; # Ignored#
esac
done
shift $(($OPTIND-1))
TEST_ARGS="$@" TEST_ARGS="$@"
rm -Rf ${RESULT_PATH} rm -Rf ${RESULT_PATH}
tests/run-parallel-regressionTest.sh
+35 -10
View File
@@ -4,15 +4,40 @@
# then compares the summary and restart files from the two runs. # then compares the summary and restart files from the two runs.
# Meant to track regression in parallel simulators. # Meant to track regression in parallel simulators.
INPUT_DATA_PATH="$1" if test $# -eq 0
RESULT_PATH="$2" then
BINPATH="$3" echo -e "Usage:\t$0 <options> -- [additional simulator options]"
FILENAME="$4" echo -e "\tMandatory options:"
ABS_TOL="$5" echo -e "\t\t -i <path> Path to read deck from"
REL_TOL="$6" echo -e "\t\t -r <path> Path to store results in"
COMPARE_ECL_COMMAND="$7" echo -e "\t\t -b <path> Path to simulator binary"
EXE_NAME="${8}" echo -e "\t\t -f <filename> Deck file name"
shift 8 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 -e <filename> Simulator binary to use"
echo -e "\tOptional options:"
echo -e "\t\t -n <procs> Number of MPI processes to use"
exit 1
fi
MPI_PROCS=4
OPTIND=1
while getopts "i:r:b:f:a:t:c:e:n:" OPT
do
case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;;
r) RESULT_PATH=${OPTARG} ;;
b) BINPATH=${OPTARG} ;;
f) FILENAME=${OPTARG} ;;
a) ABS_TOL=${OPTARG} ;;
t) REL_TOL=${OPTARG} ;;
c) COMPARE_ECL_COMMAND=${OPTARG} ;;
e) EXE_NAME=${OPTARG} ;;
n) MPI_PROCS=${OPTARG} ;;
esac
done
shift $(($OPTIND-1))
TEST_ARGS="$@" TEST_ARGS="$@"
rm -Rf ${RESULT_PATH} rm -Rf ${RESULT_PATH}
@@ -23,7 +48,7 @@ ${BINPATH}/${EXE_NAME} ${TEST_ARGS} --enable-opm-rst-file=true --output-dir=${RE
test $? -eq 0 || exit 1 test $? -eq 0 || exit 1
mkdir mpi mkdir mpi
cd mpi cd mpi
mpirun -np 4 ${BINPATH}/${EXE_NAME} ${TEST_ARGS} --enable-opm-rst-file=true --output-dir=${RESULT_PATH}/mpi mpirun -np ${MPI_PROCS} ${BINPATH}/${EXE_NAME} ${TEST_ARGS} --enable-opm-rst-file=true --output-dir=${RESULT_PATH}/mpi
test $? -eq 0 || exit 1 test $? -eq 0 || exit 1
cd .. cd ..
tests/run-parallel-restart-regressionTest.sh
+38 -12
View File
@@ -4,16 +4,42 @@
# run of the simulator, before comparing the output from the two runs. # run of the simulator, before comparing the output from the two runs.
# This is meant to track regressions in the restart support. # This is meant to track regressions in the restart support.
INPUT_DATA_PATH="$1" if test $# -eq 0
RESULT_PATH="$2" then
BINPATH="$3" echo -e "Usage:\t$0 <options> -- [additional simulator options]"
FILENAME="$4" echo -e "\tMandatory options:"
ABS_TOL="$5" echo -e "\t\t -i <path> Path to read deck from"
REL_TOL="$6" echo -e "\t\t -r <path> Path to store results in"
COMPARE_ECL_COMMAND="$7" echo -e "\t\t -b <path> Path to simulator binary"
OPM_PACK_COMMAND="$8" echo -e "\t\t -f <filename> Deck file name"
EXE_NAME="${9}" echo -e "\t\t -a <tol> Absolute tolerance in comparison"
shift 9 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 "\tOptional options:"
echo -e "\t\t -n <procs> Number of MPI processes to use"
exit 1
fi
MPI_PROCS=4
OPTIND=1
while getopts "i:r:b:f:a:t:c:p:e:n:" OPT
do
case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;;
r) RESULT_PATH=${OPTARG} ;;
b) BINPATH=${OPTARG} ;;
f) FILENAME=${OPTARG} ;;
a) ABS_TOL=${OPTARG} ;;
t) REL_TOL=${OPTARG} ;;
c) COMPARE_ECL_COMMAND=${OPTARG} ;;
p) OPM_PACK_COMMAND=${OPTARG} ;;
e) EXE_NAME=${OPTARG} ;;
n) MPI_PROCS=${OPTARG} ;;
esac
done
shift $(($OPTIND-1))
TEST_ARGS="$@" TEST_ARGS="$@"
BASE_NAME=${FILENAME}_RESTART.DATA BASE_NAME=${FILENAME}_RESTART.DATA
@@ -21,13 +47,13 @@ BASE_NAME=${FILENAME}_RESTART.DATA
rm -Rf ${RESULT_PATH} rm -Rf ${RESULT_PATH}
mkdir -p ${RESULT_PATH} mkdir -p ${RESULT_PATH}
cd ${RESULT_PATH} cd ${RESULT_PATH}
mpirun -np 4 ${BINPATH}/${EXE_NAME} ${INPUT_DATA_PATH}/${FILENAME} --enable-adaptive-time-stepping=false --output-dir=${RESULT_PATH} ${TEST_ARGS} mpirun -np ${MPI_PROCS} ${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} ${INPUT_DATA_PATH}/${FILENAME}_RESTART.DATA ${OPM_PACK_COMMAND} -o ${BASE_NAME} ${INPUT_DATA_PATH}/${FILENAME}_RESTART.DATA
mpirun -np 4 ${BINPATH}/${EXE_NAME} ${BASE_NAME} --enable-adaptive-time-stepping=false --output-dir=${RESULT_PATH} ${TEST_ARGS} 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 test $? -eq 0 || exit 1
ecode=0 ecode=0
tests/run-parallel-unitTest.sh
+24 -4
View File
@@ -1,6 +1,26 @@
#!/bin/bash #!/bin/bash
# This executes a unit test in parallel. # This executes a unit test in parallel.
NP=$1
BDIR=$2 if test $# -eq 0
shift 2 then
mpirun -np $NP $BDIR/bin/$@ echo -e "Usage:\t$0 <options> -- [additional simulator options]"
echo -e "\tMandatory options:"
echo -e "\t\t -n <procs> Number of MPI Processes to use"
echo -e "\t\t -b <path> Path to simulator binary"
echo -e "\t\t -e <filename> Simulator binary to use"
exit 1
fi
OPTIND=1
while getopts "n:b:e:" OPT
do
case "${OPT}" in
b) BDIR=${OPTARG} ;;
e) EXE_NAME=${OPTARG} ;;
n) NP=${OPTARG} ;;
esac
done
shift $(($OPTIND-1))
TEST_ARGS="$@"
mpirun -np $NP $BDIR/bin/${EXE_NAME} ${TEST_ARGS}
tests/run-porv-acceptanceTest.sh
+32 -10
View File
@@ -6,16 +6,38 @@
# Useful for models that are too large to do simulation on # Useful for models that are too large to do simulation on
# as a regression test. # as a regression test.
INPUT_DATA_PATH="$1" if test $# -eq 0
RESULT_PATH="$2" then
BINPATH="$3" echo -e "Usage:\t$0 <options> -- [additional simulator options]"
FILENAME="$4" echo -e "\tMandatory options:"
ABS_TOL="$5" echo -e "\t\t -i <path> Path to read deck from"
REL_TOL="$6" echo -e "\t\t -r <path> Path to store results in"
COMPARE_ECL_COMMAND="$7" echo -e "\t\t -b <path> Path to simulator binary"
# param 8, 9 and 10 ignored, only used with regression tests echo -e "\t\t -f <filename> Deck file name"
EXE_NAME="${11}" echo -e "\t\t -a <tol> Absolute tolerance in comparison"
shift 11 echo -e "\t\t -t <tol> Relative tolerance in comparison"
echo -e "\t\t -c <path> Path to comparison tool"
echo -e "\t\t -e <filename> Simulator binary to use"
exit 1
fi
OPTIND=1
while getopts "i:r:b:f:a:t:c:e:d:h:" OPT
do
case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;;
r) RESULT_PATH=${OPTARG} ;;
b) BINPATH=${OPTARG} ;;
f) FILENAME=${OPTARG} ;;
a) ABS_TOL=${OPTARG} ;;
t) REL_TOL=${OPTARG} ;;
c) COMPARE_ECL_COMMAND=${OPTARG} ;;
e) EXE_NAME=${OPTARG} ;;
d) ;; # Ignored
h) ;; # Ignored
esac
done
shift $(($OPTIND-1))
TEST_ARGS="$@" TEST_ARGS="$@"
rm -Rf ${RESULT_PATH} rm -Rf ${RESULT_PATH}
tests/run-regressionTest.sh
+42 -19
View File
@@ -3,18 +3,44 @@
# This runs a simulator, then compares the summary, restart and init # This runs a simulator, then compares the summary, restart and init
# files against a reference. # files against a reference.
INPUT_DATA_PATH="$1" if test $# -eq 0
RESULT_PATH="$2" then
BINPATH="$3" echo -e "Usage:\t$0 <options> -- [additional simulator options]"
FILENAME="$4" echo -e "\tMandatory options:"
ABS_TOL="$5" echo -e "\t\t -i <path> Path to read deck from"
REL_TOL="$6" echo -e "\t\t -r <path> Path to store results in"
COMPARE_ECL_COMMAND="$7" echo -e "\t\t -b <path> Path to simulator binary"
RST_DECK_COMMAND="$8" echo -e "\t\t -f <filename> Deck file name"
RESTART_STEP="${9}" echo -e "\t\t -a <tol> Absolute tolerance in comparison"
RESTART_SCHED="${10}" echo -e "\t\t -t <tol> Relative tolerance in comparison"
EXE_NAME="${11}" echo -e "\t\t -c <path> Path to comparison tool"
shift 11 echo -e "\t\t -d <path> Path to restart deck tool"
echo -e "\t\t -e <filename> Simulator binary to use"
echo -e "\tOptional options:"
echo -e "\t\t -s <step> Step to do restart testing from"
echo -e "\t\t -h value sched_restart value to use in restart test"
exit 1
fi
RESTART_STEP=0
OPTIND=1
while getopts "i:r:b:f:a:t:c:d:s:e:h:" OPT
do
case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;;
r) RESULT_PATH=${OPTARG} ;;
b) BINPATH=${OPTARG} ;;
f) FILENAME=${OPTARG} ;;
a) ABS_TOL=${OPTARG} ;;
t) REL_TOL=${OPTARG} ;;
c) COMPARE_ECL_COMMAND=${OPTARG} ;;
d) RST_DECK_COMMAND=${OPTARG} ;;
s) RESTART_STEP=${OPTARG} ;;
e) EXE_NAME=${OPTARG} ;;
h) RESTART_SCHED=${OPTARG} ;;
esac
done
shift $(($OPTIND-1))
TEST_ARGS="$@" TEST_ARGS="$@"
mkdir -p ${RESULT_PATH} mkdir -p ${RESULT_PATH}
@@ -43,17 +69,14 @@ fi
if test $RESTART_STEP -ne 0 if test $RESTART_STEP -ne 0
then then
echo "=== Executing restart run ===" echo "=== Executing restart run ==="
if [ "$RESTART_SCHED" = "--" ]; then
sched_rst=""
else
sched_rst="${RESTART_SCHED}"
fi
mkdir -p ${RESULT_PATH}/restart mkdir -p ${RESULT_PATH}/restart
cp -f ${RESULT_PATH}/${FILENAME}.UNRST ${RESULT_PATH}/restart cp -f ${RESULT_PATH}/${FILENAME}.UNRST ${RESULT_PATH}/restart
${RST_DECK_COMMAND} ${INPUT_DATA_PATH}/${FILENAME}.DATA ${FILENAME}:${RESTART_STEP} -m inline -s > ${RESULT_PATH}/restart/${FILENAME}.DATA ${RST_DECK_COMMAND} ${INPUT_DATA_PATH}/${FILENAME}.DATA ${FILENAME}:${RESTART_STEP} -m inline -s > ${RESULT_PATH}/restart/${FILENAME}.DATA
cd ${RESULT_PATH}/restart cd ${RESULT_PATH}/restart
echo ${BINPATH}/${EXE_NAME} ${TEST_ARGS} ${sched_rst} --output-dir=${RESULT_PATH}/restart ${FILENAME} if test -n "$RESTART_SCHED"
then
sched_rst="--sched-restart=${RESTART_SCHED}"
fi
${BINPATH}/${EXE_NAME} ${TEST_ARGS} ${sched_rst} --output-dir=${RESULT_PATH}/restart ${FILENAME} ${BINPATH}/${EXE_NAME} ${TEST_ARGS} ${sched_rst} --output-dir=${RESULT_PATH}/restart ${FILENAME}
test $? -eq 0 || exit 1 test $? -eq 0 || exit 1
tests/run-restart-regressionTest.sh
+32 -10
View File
@@ -4,16 +4,38 @@
# run of the simulator, before comparing the output from the two runs. # run of the simulator, before comparing the output from the two runs.
# This is meant to track regressions in the restart support. # This is meant to track regressions in the restart support.
INPUT_DATA_PATH="$1" if test $# -eq 0
RESULT_PATH="$2" then
BINPATH="$3" echo -e "Usage:\t$0 <options> -- [additional simulator options]"
FILENAME="$4" echo -e "\tMandatory options:"
ABS_TOL="$5" echo -e "\t\t -i <path> Path to read deck from"
REL_TOL="$6" echo -e "\t\t -r <path> Path to store results in"
COMPARE_ECL_COMMAND="$7" echo -e "\t\t -b <path> Path to simulator binary"
OPM_PACK_COMMAND="$8" echo -e "\t\t -f <filename> Deck file name"
EXE_NAME="${9}" echo -e "\t\t -a <tol> Absolute tolerance in comparison"
shift 9 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"
exit 1
fi
OPTIND=1
while getopts "i:r:b:f:a:t:c:p:e:" OPT
do
case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;;
r) RESULT_PATH=${OPTARG} ;;
b) BINPATH=${OPTARG} ;;
f) FILENAME=${OPTARG} ;;
a) ABS_TOL=${OPTARG} ;;
t) REL_TOL=${OPTARG} ;;
c) COMPARE_ECL_COMMAND=${OPTARG} ;;
p) OPM_PACK_COMMAND=${OPTARG} ;;
e) EXE_NAME=${OPTARG} ;;
esac
done
shift $(($OPTIND-1))
TEST_ARGS="$@" TEST_ARGS="$@"
BASE_NAME=${FILENAME}_RESTART.DATA BASE_NAME=${FILENAME}_RESTART.DATA
tests/run-summary-restart-regressionTest.sh
+32 -10
View File
@@ -6,16 +6,38 @@
# but in situations where it is difficult to get the restart files to agree this # but in situations where it is difficult to get the restart files to agree this
# script can be used as second-best alternative. # script can be used as second-best alternative.
INPUT_DATA_PATH="$1" if test $# -eq 0
RESULT_PATH="$2" then
BINPATH="$3" echo -e "Usage:\t$0 <options> -- [additional simulator options]"
FILENAME="$4" echo -e "\tMandatory options:"
ABS_TOL="$5" echo -e "\t\t -i <path> Path to read deck from"
REL_TOL="$6" echo -e "\t\t -r <path> Path to store results in"
COMPARE_ECL_COMMAND="$7" echo -e "\t\t -b <path> Path to simulator binary"
OPM_PACK_COMMAND="$8" echo -e "\t\t -f <filename> Deck file name"
EXE_NAME="${9}" echo -e "\t\t -a <tol> Absolute tolerance in comparison"
shift 9 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"
exit 1
fi
OPTIND=1
while getopts "i:r:b:f:a:t:c:p:e:" OPT
do
case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;;
r) RESULT_PATH=${OPTARG} ;;
b) BINPATH=${OPTARG} ;;
f) FILENAME=${OPTARG} ;;
a) ABS_TOL=${OPTARG} ;;
t) REL_TOL=${OPTARG} ;;
c) COMPARE_ECL_COMMAND=${OPTARG} ;;
p) OPM_PACK_COMMAND=${OPTARG} ;;
e) EXE_NAME=${OPTARG} ;;
esac
done
shift $(($OPTIND-1))
TEST_ARGS="$@" TEST_ARGS="$@"
BASE_NAME=${FILENAME}_RESTART.DATA BASE_NAME=${FILENAME}_RESTART.DATA
tests/run-test.sh
+26 -7
View File
@@ -2,13 +2,32 @@
# This simply runs a simulator. # This simply runs a simulator.
INPUT_DATA_PATH="$1" if test $# -eq 0
RESULT_PATH="$2" then
BINPATH="$3" echo -e "Usage:\t$0 <options> -- [additional simulator options]"
EXE_NAME="$4" echo -e "\tMandatory options:"
FILENAME="$5" echo -e "\t\t -i <path> Path to read deck from"
MPI_PROCS="$6" echo -e "\t\t -r <path> Path to store results in"
shift 7 echo -e "\t\t -b <path> Path to simulator binary"
echo -e "\t\t -f <filename> Deck file name"
echo -e "\t\t -e <filename> Simulator binary to use"
echo -e "\t\t -n <procs > Number of MPI processes to use"
exit 1
fi
OPTIND=1
while getopts "i:r:b:f:e:n:" OPT
do
case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;;
r) RESULT_PATH=${OPTARG} ;;
b) BINPATH=${OPTARG} ;;
f) FILENAME=${OPTARG} ;;
e) EXE_NAME=${OPTARG} ;;
n) MPI_PROCS=${OPTARG} ;;
esac
done
shift $(($OPTIND-1))
TEST_ARGS="$@" TEST_ARGS="$@"
mkdir -p ${RESULT_PATH} mkdir -p ${RESULT_PATH}