mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-11 23:45:32 -06:00
Merge pull request #5266 from lisajulia/feature/pyAction-comparison-tests
Comparison tests for PYACTION
This commit is contained in:
Markus Blatt
GitHub
commit
ca71415297
@ -95,6 +95,38 @@ function(add_test_compareECLFiles)
|
||||
TESTNAME ${PARAM_CASENAME})
|
||||
endfunction()
|
||||
|
||||
function(add_test_compareSeparateECLFiles)
|
||||
set(oneValueArgs CASENAME FILENAME1 FILENAME2 DIR1 DIR2 SIMULATOR ABS_TOL REL_TOL IGNORE_EXTRA_KW DIR_PREFIX)
|
||||
set(multiValueArgs TEST_ARGS)
|
||||
cmake_parse_arguments(PARAM "$" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
|
||||
if(NOT PARAM_PREFIX)
|
||||
set(PARAM_PREFIX compareSeparateECLFiles)
|
||||
endif()
|
||||
set(RESULT_PATH ${BASE_RESULT_PATH}${PARAM_DIR_PREFIX}/${PARAM_SIMULATOR}+${PARAM_CASENAME})
|
||||
set(TEST_ARGS ${PARAM_TEST_ARGS})
|
||||
set(DRIVER_ARGS -i ${OPM_TESTS_ROOT}/${PARAM_DIR1}
|
||||
-j ${OPM_TESTS_ROOT}/${PARAM_DIR2}
|
||||
-f ${PARAM_FILENAME1}
|
||||
-g ${PARAM_FILENAME2}
|
||||
-r ${RESULT_PATH}
|
||||
-b ${PROJECT_BINARY_DIR}/bin
|
||||
-a ${PARAM_ABS_TOL}
|
||||
-t ${PARAM_REL_TOL}
|
||||
-c ${COMPARE_ECL_COMMAND})
|
||||
if(PARAM_IGNORE_EXTRA_KW)
|
||||
list(APPEND DRIVER_ARGS -y ${PARAM_IGNORE_EXTRA_KW})
|
||||
endif()
|
||||
opm_add_test(${PARAM_PREFIX}_${PARAM_SIMULATOR}+${PARAM_CASENAME} NO_COMPILE
|
||||
EXE_NAME ${PARAM_SIMULATOR}
|
||||
DRIVER_ARGS ${DRIVER_ARGS}
|
||||
TEST_ARGS ${TEST_ARGS})
|
||||
set_tests_properties(${PARAM_PREFIX}_${PARAM_SIMULATOR}+${PARAM_CASENAME} PROPERTIES
|
||||
DIRNAME ${PARAM_DIR}
|
||||
FILENAME ${PARAM_FILENAME}
|
||||
SIMULATOR ${PARAM_SIMULATOR}
|
||||
TESTNAME ${PARAM_CASENAME})
|
||||
endfunction()
|
||||
|
||||
###########################################################################
|
||||
# TEST: add_test_compare_restarted_simulation
|
||||
###########################################################################
|
||||
@ -361,7 +393,9 @@ add_test_runSimulator(CASENAME tuning_tsinit_nextstep
|
||||
TEST_ARGS --enable-tuning=true
|
||||
POST_COMMAND $<TARGET_FILE:test_tuning_tsinit_nextstep>)
|
||||
|
||||
|
||||
if (opm-common_EMBEDDED_PYTHON)
|
||||
include (${CMAKE_CURRENT_SOURCE_DIR}/pyactionComparisons.cmake)
|
||||
endif ()
|
||||
include (${CMAKE_CURRENT_SOURCE_DIR}/regressionTests.cmake)
|
||||
include (${CMAKE_CURRENT_SOURCE_DIR}/restartTests.cmake)
|
||||
|
||||
|
||||
66
pyactionComparisons.cmake
Normal file
66
pyactionComparisons.cmake
Normal file
@ -0,0 +1,66 @@
|
||||
# Regression tests
|
||||
opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-comparison.sh "")
|
||||
|
||||
# Set absolute tolerance to be used passed to the macros in the following tests
|
||||
set(abs_tol 1e+5)
|
||||
set(rel_tol 2e-5)
|
||||
set(coarse_rel_tol 1e-2)
|
||||
add_test_compareSeparateECLFiles(CASENAME pyaction_gconprod_insert_kw
|
||||
DIR1 pyaction
|
||||
FILENAME1 PYACTION_GCONPROD_INSERT_KW
|
||||
DIR2 actionx
|
||||
FILENAME2 ACTIONX_GCONPROD
|
||||
SIMULATOR flow
|
||||
ABS_TOL ${abs_tol}
|
||||
REL_TOL ${rel_tol}
|
||||
IGNORE_EXTRA_KW BOTH)
|
||||
|
||||
add_test_compareSeparateECLFiles(CASENAME pyaction_mult+_insert_kw
|
||||
DIR1 pyaction
|
||||
FILENAME1 PYACTION_MULT+_INSERT_KW
|
||||
DIR2 actionx
|
||||
FILENAME2 ACTIONX_MULT+
|
||||
SIMULATOR flow
|
||||
ABS_TOL ${abs_tol}
|
||||
REL_TOL ${rel_tol}
|
||||
IGNORE_EXTRA_KW BOTH)
|
||||
|
||||
add_test_compareSeparateECLFiles(CASENAME pyaction_multx+_insert_kw
|
||||
DIR1 pyaction
|
||||
FILENAME1 PYACTION_MULTX+_INSERT_KW
|
||||
DIR2 actionx
|
||||
FILENAME2 ACTIONX_MULTX+
|
||||
SIMULATOR flow
|
||||
ABS_TOL ${abs_tol}
|
||||
REL_TOL ${rel_tol}
|
||||
IGNORE_EXTRA_KW BOTH)
|
||||
|
||||
add_test_compareSeparateECLFiles(CASENAME pyaction_multx-_insert_kw
|
||||
DIR1 pyaction
|
||||
FILENAME1 PYACTION_MULTX-_INSERT_KW
|
||||
DIR2 actionx
|
||||
FILENAME2 ACTIONX_MULTX-
|
||||
SIMULATOR flow
|
||||
ABS_TOL ${abs_tol}
|
||||
REL_TOL ${rel_tol}
|
||||
IGNORE_EXTRA_KW BOTH)
|
||||
|
||||
add_test_compareSeparateECLFiles(CASENAME pyaction_wconprod_insert_kw
|
||||
DIR1 pyaction
|
||||
FILENAME1 PYACTION_WCONPROD_INSERT_KW
|
||||
DIR2 actionx
|
||||
FILENAME2 ACTIONX_WCONPROD
|
||||
SIMULATOR flow
|
||||
ABS_TOL ${abs_tol}
|
||||
REL_TOL ${rel_tol}
|
||||
IGNORE_EXTRA_KW BOTH)
|
||||
|
||||
add_test_compareSeparateECLFiles(CASENAME pyaction_wefac_insert_kw
|
||||
DIR1 pyaction
|
||||
FILENAME1 PYACTION_WEFAC_INSERT_KW
|
||||
DIR2 actionx
|
||||
FILENAME2 ACTIONX_WEFAC
|
||||
SIMULATOR flow
|
||||
ABS_TOL ${abs_tol}
|
||||
REL_TOL ${rel_tol}
|
||||
IGNORE_EXTRA_KW BOTH)
|
||||
74
tests/run-comparison.sh
Executable file
74
tests/run-comparison.sh
Executable file
@ -0,0 +1,74 @@
|
||||
#!/bin/bash
|
||||
|
||||
# This does two simulator runs and compares the summary files against each other.
|
||||
|
||||
if test $# -eq 0
|
||||
then
|
||||
echo -e "Usage:\t$0 <options> -- [additional simulator options]"
|
||||
echo -e "\tMandatory options:"
|
||||
echo -e "\t\t -i <path> Path to read first deck from"
|
||||
echo -e "\t\t -j <path> Path to read second deck from"
|
||||
echo -e "\t\t -f <filename> First deck file name"
|
||||
echo -e "\t\t -g value Second deck file name"
|
||||
echo -e "\t\t -y value Ignore extra keywords in the run. For -y 'BOTH', extra keywords in both runs will be ignored. For -y 'SECOND', extra keywords in the second deck will be ignored."
|
||||
echo -e "\t\t -r <path> Path to store results in"
|
||||
echo -e "\t\t -b <path> Path to simulator binary"
|
||||
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"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
RESTART_STEP=""
|
||||
OPTIND=1
|
||||
while getopts "i:j:f:g:r:b:a:t:c:e:y:" OPT
|
||||
do
|
||||
case "${OPT}" in
|
||||
i) INPUT_DATA_PATH1=${OPTARG} ;;
|
||||
j) INPUT_DATA_PATH2=${OPTARG} ;;
|
||||
f) FILENAME1=${OPTARG} ;;
|
||||
g) FILENAME2=${OPTARG} ;;
|
||||
r) RESULT_PATH=${OPTARG} ;;
|
||||
b) BINPATH=${OPTARG} ;;
|
||||
a) ABS_TOL=${OPTARG} ;;
|
||||
t) REL_TOL=${OPTARG} ;;
|
||||
c) COMPARE_ECL_COMMAND=${OPTARG} ;;
|
||||
e) EXE_NAME=${OPTARG} ;;
|
||||
y) IGNORE_EXTRA_KW=${OPTARG} ;;
|
||||
esac
|
||||
done
|
||||
shift $(($OPTIND-1))
|
||||
TEST_ARGS="$@"
|
||||
|
||||
mkdir -p ${RESULT_PATH}
|
||||
cd ${RESULT_PATH}
|
||||
${BINPATH}/${EXE_NAME} ${INPUT_DATA_PATH1}/${FILENAME1} ${TEST_ARGS} --output-dir=${RESULT_PATH}
|
||||
test $? -eq 0 || exit 1
|
||||
${BINPATH}/${EXE_NAME} ${INPUT_DATA_PATH2}/${FILENAME2} ${TEST_ARGS} --output-dir=${RESULT_PATH}
|
||||
test $? -eq 0 || exit 1
|
||||
cd ..
|
||||
|
||||
|
||||
ecode=0
|
||||
|
||||
ignore_extra_kw=""
|
||||
if grep -q "SECOND" <<< $IGNORE_EXTRA_KW
|
||||
then
|
||||
ignore_extra_kw="-x"
|
||||
fi
|
||||
|
||||
if grep -q "BOTH" <<< $IGNORE_EXTRA_KW
|
||||
then
|
||||
ignore_extra_kw="-y"
|
||||
fi
|
||||
|
||||
echo "=== Executing comparison for EGRID, INIT, UNRST and RFT files if these exists in reference folder ==="
|
||||
${COMPARE_ECL_COMMAND} -t SMRY ${ignore_extra_kw} ${RESULT_PATH}/${FILENAME1} ${RESULT_PATH}/${FILENAME2} ${ABS_TOL} ${REL_TOL}
|
||||
if [ $? -ne 0 ]
|
||||
then
|
||||
ecode=1
|
||||
${COMPARE_ECL_COMMAND} -t SMRY ${ignore_extra_kw} -a ${RESULT_PATH}/${FILENAME1} ${RESULT_PATH}/${FILENAME2} ${ABS_TOL} ${REL_TOL}
|
||||
fi
|
||||
|
||||
exit $ecode
|
||||
Loading…
Reference in New Issue
Block a user