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

Added more cases/models to ctest

Browse Source
This commit is contained in:
Kristian Hole-Drabløs
2016-08-04 13:54:37 +02:00
committed by Arne Morten Kvarving
parent fbc47cc186
commit af2a59d1b8
3 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -144,7 +144,5 @@ if (HAVE_OPM_DATA)
$<TARGET_FILE:flow> ${OPM_DATA_ROOT}/spe1/SPE1CASE2.DATA ${OPM_DATA_ROOT}/spe1/SPE1CASE2_RESTART.DATA ) $<TARGET_FILE:flow> ${OPM_DATA_ROOT}/spe1/SPE1CASE2.DATA ${OPM_DATA_ROOT}/spe1/SPE1CASE2_RESTART.DATA )
endif() endif()
include (${CMAKE_CURRENT_SOURCE_DIR}/compareECLFiles.cmake) include (${CMAKE_CURRENT_SOURCE_DIR}/compareECLFiles.cmake)
endif() endif()

28
compareECLFiles.cmake
View File

@@ -1,29 +1,29 @@
# Set absolute tolerance to be used for testing # Set absolute tolerance to be used for testing
set(abs_tol 2e-2) set(abs_tol 2e-2)
set(rel_tol 1e-5) set(rel_tol 1e-5)
# Define some paths # Define some paths
set(RESULT_PATH ${PROJECT_BINARY_DIR}/tests/results) set(BASE_RESULT_PATH ${PROJECT_BINARY_DIR}/tests/results)
# Create directory to store upscaling results in
########################################################################### ###########################################################################
# TEST: compareECLFiles # TEST: compareECLFiles
########################################################################### ###########################################################################
# Input: # Input:
# - casename: basename (no extension) # - casename: basename (no extension)
# #
macro (add_test_compareECLFiles casename filename) macro (add_test_compareECLFiles casename filename)
set(RESULT_PATH ${BASE_RESULT_PATH}/${casename})
# Add test that runs flow and outputs the results to file # Add test that runs flow and outputs the results to file
opm_add_test(compareECLFiles_${filename} NO_COMPILE opm_add_test(compareECLFiles_${filename} NO_COMPILE
EXE_NAME flow EXE_NAME flow
DRIVER_ARGS ${OPM_DATA_ROOT}/${casename} ${RESULT_PATH} DRIVER_ARGS ${OPM_DATA_ROOT}/${casename} ${RESULT_PATH}
${CMAKE_BINARY_DIR}/bin ${CMAKE_BINARY_DIR}/bin
${filename} ${filename}
${abs_tol} ${rel_tol} ${abs_tol} ${rel_tol}
${SUMMARY_REGRESSION_TEST_COMMAND} ${COMPARE_SUMMARY_COMMAND}
${RESTART_REGRESSION_TEST_COMMAND} ${COMPARE_ECL_COMMAND}
${INIT_REGRESSION_TEST_COMMAND}
TEST_ARGS ${OPM_DATA_ROOT}/${casename}/${filename}.DATA ) TEST_ARGS ${OPM_DATA_ROOT}/${casename}/${filename}.DATA )
endmacro (add_test_compareECLFiles) endmacro (add_test_compareECLFiles)
@@ -32,8 +32,8 @@ if(NOT TARGET test-suite)
add_custom_target(test-suite) add_custom_target(test-suite)
endif() endif()
opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-regressionTest.sh "") opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-regressionTest.sh "")
add_test_compareECLFiles(spe9 SPE9_CP) add_test_compareECLFiles(spe1 SPE1CASE2)
add_test_compareECLFiles(spe3 SPE3CASE1)
add_test_compareECLFiles(spe9 SPE9_CP_SHORT)

20
tests/run-regressionTest.sh
View File

@@ -7,23 +7,23 @@ BINPATH="$3"
FILENAME="$4" FILENAME="$4"
ABS_TOL="$5" ABS_TOL="$5"
REL_TOL="$6" REL_TOL="$6"
SUMMARY_REGRESSION_TEST_COMMAND="$7" COMPARE_SUMMARY_COMMAND="$7"
RESTART_REGRESSION_TEST_COMMAND="$8" COMPARE_ECL_COMMAND="$8"
INIT_REGRESSION_TEST_COMMAND="$9" EXE_NAME="${9}"
EXE_NAME="${10}" shift 9
shift 10
TEST_ARGS="$@" TEST_ARGS="$@"
rm -Rf ${RESULT_PATH}
rm -Rf ${RESULT_PATH};
mkdir -p ${RESULT_PATH} mkdir -p ${RESULT_PATH}
cd ${RESULT_PATH} cd ${RESULT_PATH}
${BINPATH}/${EXE_NAME} ${TEST_ARGS} ${BINPATH}/${EXE_NAME} ${TEST_ARGS}
cd .. cd ..
${SUMMARY_REGRESSION_TEST_COMMAND} ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL} ${COMPARE_SUMMARY_COMMAND} -r ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL}
${COMPARE_ECL_COMMAND} ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL}
${COMPARE_ECL_COMMAND} -t INIT ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL}
${RESTART_REGRESSION_TEST_COMMAND} ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL}
${INIT_REGRESSION_TEST_COMMAND} ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL}