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

Add RESTART_SCHED argument to test registration

Browse Source
This commit is contained in:
Joakim Hove
2021-10-12 16:57:41 +02:00
parent cc1adf0b2a
commit 9b0b4f42a0
4 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
compareECLFiles.cmake
View File

@@ -50,7 +50,7 @@ endfunction()
# Details: # Details:
# - This test class compares output from a simulation to reference files. # - This test class compares output from a simulation to reference files.
function(add_test_compareECLFiles) function(add_test_compareECLFiles)
set(oneValueArgs CASENAME FILENAME SIMULATOR ABS_TOL REL_TOL DIR DIR_PREFIX PREFIX RESTART_STEP) set(oneValueArgs CASENAME FILENAME SIMULATOR ABS_TOL REL_TOL DIR DIR_PREFIX PREFIX RESTART_STEP RESTART_SCHED)
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)
@@ -62,6 +62,11 @@ function(add_test_compareECLFiles)
if(NOT PARAM_RESTART_STEP) if(NOT PARAM_RESTART_STEP)
set(PARAM_RESTART_STEP 0) set(PARAM_RESTART_STEP 0)
endif() 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})
opm_add_test(${PARAM_PREFIX}_${PARAM_SIMULATOR}+${PARAM_FILENAME} NO_COMPILE opm_add_test(${PARAM_PREFIX}_${PARAM_SIMULATOR}+${PARAM_FILENAME} NO_COMPILE
@@ -73,6 +78,7 @@ function(add_test_compareECLFiles)
${COMPARE_ECL_COMMAND} ${COMPARE_ECL_COMMAND}
${RST_DECK_COMMAND} ${RST_DECK_COMMAND}
${PARAM_RESTART_STEP} ${PARAM_RESTART_STEP}
${sched_restart}
TEST_ARGS ${TEST_ARGS}) TEST_ARGS ${TEST_ARGS})
endfunction() endfunction()
@@ -209,6 +215,7 @@ add_test_compareECLFiles(CASENAME spe12
SIMULATOR flow SIMULATOR flow
ABS_TOL ${abs_tol} ABS_TOL ${abs_tol}
REL_TOL ${coarse_rel_tol} REL_TOL ${coarse_rel_tol}
RESTART_SCHED false
DIR spe1) DIR spe1)
add_test_compareECLFiles(CASENAME spe1_2p add_test_compareECLFiles(CASENAME spe1_2p

6
tests/run-init-regressionTest.sh
View File

@@ -13,9 +13,9 @@ FILENAME="$4"
ABS_TOL="$5" ABS_TOL="$5"
REL_TOL="$6" REL_TOL="$6"
COMPARE_ECL_COMMAND="$7" COMPARE_ECL_COMMAND="$7"
# param 8 and 9 ignored, only used with regression tests # param 8, 9 and 10 ignored, only used with regression tests
EXE_NAME="${10}" EXE_NAME="${11}"
shift 10 shift 11
TEST_ARGS="$@" TEST_ARGS="$@"
rm -Rf ${RESULT_PATH} rm -Rf ${RESULT_PATH}

6
tests/run-porv-acceptanceTest.sh
View File

@@ -13,9 +13,9 @@ FILENAME="$4"
ABS_TOL="$5" ABS_TOL="$5"
REL_TOL="$6" REL_TOL="$6"
COMPARE_ECL_COMMAND="$7" COMPARE_ECL_COMMAND="$7"
# param 8 and 9 ignored, only used with regression tests # param 8, 9 and 10 ignored, only used with regression tests
EXE_NAME="${10}" EXE_NAME="${11}"
shift 10 shift 11
TEST_ARGS="$@" TEST_ARGS="$@"
rm -Rf ${RESULT_PATH} rm -Rf ${RESULT_PATH}

15
tests/run-regressionTest.sh
View File

@@ -12,8 +12,9 @@ REL_TOL="$6"
COMPARE_ECL_COMMAND="$7" COMPARE_ECL_COMMAND="$7"
RST_DECK_COMMAND="$8" RST_DECK_COMMAND="$8"
RESTART_STEP="${9}" RESTART_STEP="${9}"
EXE_NAME="${10}" RESTART_SCHED="${10}"
shift 10 EXE_NAME="${11}"
shift 11
TEST_ARGS="$@" TEST_ARGS="$@"
mkdir -p ${RESULT_PATH} mkdir -p ${RESULT_PATH}
@@ -42,12 +43,18 @@ 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} --output-dir=${RESULT_PATH}/restart ${FILENAME} echo ${BINPATH}/${EXE_NAME} ${TEST_ARGS} ${sched_rst} --output-dir=${RESULT_PATH}/restart ${FILENAME}
${BINPATH}/${EXE_NAME} ${TEST_ARGS} --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
echo "=== Executing comparison for EGRID, INIT, UNRST and RFT files for restarted run ===" echo "=== Executing comparison for EGRID, INIT, UNRST and RFT files for restarted run ==="