OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-11-02 20:30:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7050 from akva2/dev_simulators

Browse Source 
Add option to use the development simulator binaries (e.g. flow_blackoil) in regression tests
This commit is contained in:
Bård Skaflestad authored and GitHub committed 2026-05-15 14:54:29 +02:00
2 parents bc0626acff b7b1db57b0
commit 70e938a414
12 files changed
+5066 -1873
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CMakeLists.txt
+1
View File
@@ -34,6 +34,7 @@ option(USE_AMGX "Enable AMGX support?" OFF)
option(USE_HYPRE "Use the Hypre library for linear solvers?" OFF)
set(OPM_COMPILE_COMPONENTS "2;3;4;5;6;7" CACHE STRING "The components to compile support for")
option(USE_OPENCL "Enable OpenCL support?" ON)
option(USE_DEV_SIMULATOR_IN_TESTS "Use the development simulator binaries in tests?" OFF)
# Wrapper for opm_add_target_options that also adds
# compile definitions and target links from the library
compareECLFiles.cmake
+355 -103
View File
@@ -21,7 +21,17 @@ set(BASE_RESULT_PATH ${PROJECT_BINARY_DIR}/tests/results)
# Details:
# - This test class simply runs a simulation.
function(add_test_runSimulator)
set(oneValueArgs CASENAME FILENAME SIMULATOR DIR DIR_PREFIX PROCS CONFIGURATION POST_COMMAND)
set(oneValueArgs
CASENAME
FILENAME
DEV_SIMULATOR
SIMULATOR
DIR
DIR_PREFIX
PROCS
CONFIGURATION
POST_COMMAND
)
set(multiValueArgs TEST_ARGS)
cmake_parse_arguments(PARAM "$" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
if(NOT PARAM_DIR)
@@ -39,11 +49,14 @@ function(add_test_runSimulator)
if(PARAM_POST_COMMAND)
list(APPEND DRIVER_ARGS -p "${PARAM_POST_COMMAND}")
endif()
opm_add_test(runSimulator/${PARAM_CASENAME} NO_COMPILE
EXE_NAME ${PARAM_SIMULATOR}
DRIVER_ARGS ${DRIVER_ARGS}
TEST_ARGS ${TEST_ARGS}
CONFIGURATION ${PARAM_CONFIGURATION})
if(USE_DEV_SIMULATOR_IN_TESTS AND PARAM_DEV_SIMULATOR)
set(PARAM_SIMULATOR ${PARAM_DEV_SIMULATOR})
endif()
opm_add_test(runSimulator/${PARAM_CASENAME} NO_COMPILE
EXE_NAME ${PARAM_SIMULATOR}
DRIVER_ARGS ${DRIVER_ARGS}
TEST_ARGS ${TEST_ARGS}
CONFIGURATION ${PARAM_CONFIGURATION})
if(PARAM_PROCS)
set_tests_properties(runSimulator/${PARAM_CASENAME} PROPERTIES PROCESSORS ${PARAM_PROCS})
endif()
@@ -59,7 +72,19 @@ endfunction()
# Details:
# - This test class compares output from a simulation to reference files.
function(add_test_compareECLFiles)
set(oneValueArgs CASENAME FILENAME SIMULATOR ABS_TOL REL_TOL DIR DIR_PREFIX PREFIX RESTART_STEP RESTART_SCHED)
set(oneValueArgs
CASENAME
FILENAME
DEV_SIMULATOR
SIMULATOR
ABS_TOL
REL_TOL
DIR
DIR_PREFIX
PREFIX
RESTART_STEP
RESTART_SCHED
)
set(multiValueArgs TEST_ARGS)
cmake_parse_arguments(PARAM "$" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
if(NOT PARAM_DIR)
@@ -84,6 +109,10 @@ function(add_test_compareECLFiles)
if(PARAM_RESTART_SCHED STREQUAL "false" OR PARAM_RESTART_SCHED STREQUAL "true")
list(APPEND DRIVER_ARGS -h ${PARAM_RESTART_SCHED})
endif()
list(APPEND DRIVER_ARGS -u ${PARAM_SIMULATOR})
if(USE_DEV_SIMULATOR_IN_TESTS AND PARAM_DEV_SIMULATOR)
set(PARAM_SIMULATOR ${PARAM_DEV_SIMULATOR})
endif()
opm_add_test(${PARAM_PREFIX}_${PARAM_SIMULATOR}+${PARAM_FILENAME} NO_COMPILE
EXE_NAME ${PARAM_SIMULATOR}
DRIVER_ARGS ${DRIVER_ARGS}
@@ -107,7 +136,20 @@ endfunction()
# Details:
# - This test class compares two separate simulations
function(add_test_compareSeparateECLFiles)
set(oneValueArgs CASENAME FILENAME1 FILENAME2 DIR1 DIR2 SIMULATOR ABS_TOL REL_TOL IGNORE_EXTRA_KW DIR_PREFIX MPI_PROCS)
set(oneValueArgs
CASENAME
FILENAME1
FILENAME2
DIR1
DIR2
DEV_SIMULATOR
SIMULATOR
ABS_TOL
REL_TOL
IGNORE_EXTRA_KW
DIR_PREFIX
MPI_PROCS
)
set(multiValueArgs TEST_ARGS)
cmake_parse_arguments(PARAM "$" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
if(NOT PARAM_PREFIX)
@@ -121,6 +163,9 @@ function(add_test_compareSeparateECLFiles)
if(NOT PARAM_DIR)
set(PARAM_DIR ${PARAM_CASENAME})
endif()
if(USE_DEV_SIMULATOR_IN_TESTS AND PARAM_DEV_SIMULATOR)
set(PARAM_SIMULATOR ${PARAM_DEV_SIMULATOR})
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}
@@ -164,12 +209,25 @@ endfunction()
# - This test class compares the output from a restarted simulation
# to that of a non-restarted simulation.
function(add_test_compare_restarted_simulation)
set(oneValueArgs CASENAME FILENAME SIMULATOR TEST_NAME ABS_TOL REL_TOL DIR RESTART_STEP)
set(oneValueArgs
CASENAME
FILENAME
DEV_SIMULATOR
SIMULATOR
TEST_NAME
ABS_TOL
REL_TOL
DIR
RESTART_STEP
)
set(multiValueArgs TEST_ARGS)
cmake_parse_arguments(PARAM "$" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
if(NOT PARAM_DIR)
set(PARAM_DIR ${PARAM_CASENAME})
endif()
if(USE_DEV_SIMULATOR_IN_TESTS AND PARAM_DEV_SIMULATOR)
set(PARAM_SIMULATOR ${PARAM_DEV_SIMULATOR})
endif()
if (PARAM_TEST_NAME)
set(TEST_NAME ${PARAM_TEST_NAME})
else()
@@ -202,7 +260,17 @@ endfunction()
# - This test class compares the output from a parallel simulation
# to the output from the serial instance of the same model.
function(add_test_compare_parallel_simulation)
set(oneValueArgs CASENAME FILENAME SIMULATOR ABS_TOL REL_TOL DIR POSTFIX MPI_PROCS)
set(oneValueArgs
CASENAME
FILENAME
DEV_SIMULATOR
SIMULATOR
ABS_TOL
REL_TOL
DIR
POSTFIX
MPI_PROCS
)
set(multiValueArgs TEST_ARGS)
cmake_parse_arguments(PARAM "$" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
@@ -222,6 +290,10 @@ function(add_test_compare_parallel_simulation)
set(MPI_PROCS 4)
endif()
if(USE_DEV_SIMULATOR_IN_TESTS AND PARAM_DEV_SIMULATOR)
set(PARAM_SIMULATOR ${PARAM_DEV_SIMULATOR})
endif()
if(MPIEXEC_MAX_NUMPROCS GREATER_EQUAL MPI_PROCS)
# Local computer system has at least ${MPI_PROCS} CPUs. Register test.
set(RESULT_PATH ${BASE_RESULT_PATH}/parallel/${PARAM_SIMULATOR}+${PARAM_CASENAME})
@@ -258,7 +330,18 @@ endfunction()
# - This test class compares the output from a restarted parallel simulation
# to that of a non-restarted parallel simulation.
function(add_test_compare_parallel_restarted_simulation)
set(oneValueArgs CASENAME FILENAME SIMULATOR ABS_TOL REL_TOL DIR MPI_PROCS RESTART_STEP TEST_NAME)
set(oneValueArgs
CASENAME
FILENAME
DEV_SIMULATOR
SIMULATOR
ABS_TOL
REL_TOL
DIR
MPI_PROCS
RESTART_STEP
TEST_NAME
)
set(multiValueArgs TEST_ARGS)
cmake_parse_arguments(PARAM "$" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
@@ -266,6 +349,10 @@ function(add_test_compare_parallel_restarted_simulation)
set(PARAM_DIR ${PARAM_CASENAME})
endif()
if(USE_DEV_SIMULATOR_IN_TESTS AND PARAM_DEV_SIMULATOR)
set(PARAM_SIMULATOR ${PARAM_DEV_SIMULATOR})
endif()
if (PARAM_TEST_NAME)
set(TEST_NAME ${PARAM_TEST_NAME})
else()
@@ -312,7 +399,16 @@ endfunction()
# - This test class compares the output from a parallel simulation
# to that of a parallel simulation running with a custom communicator.
function(add_test_split_comm)
set(oneValueArgs CASENAME FILENAME SIMULATOR ABS_TOL REL_TOL DIR MPI_PROCS)
set(oneValueArgs
CASENAME
FILENAME
DEV_SIMULATOR
SIMULATOR
ABS_TOL
REL_TOL
DIR
MPI_PROCS
)
set(multiValueArgs TEST_ARGS)
cmake_parse_arguments(PARAM "$" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
@@ -326,6 +422,10 @@ function(add_test_split_comm)
set(MPI_PROCS 4)
endif()
if(USE_DEV_SIMULATOR_IN_TESTS AND PARAM_DEV_SIMULATOR)
set(PARAM_SIMULATOR ${PARAM_DEV_SIMULATOR})
endif()
set(RESULT_PATH ${BASE_RESULT_PATH}/parallelSplitComm/${PARAM_SIMULATOR}+${PARAM_CASENAME})
set(DRIVER_ARGS -i ${OPM_TESTS_ROOT}/${PARAM_DIR}
-r ${RESULT_PATH}
@@ -357,7 +457,18 @@ endfunction()
# Details:
# - This test class compares output from a simulation to reference files.
function(add_test_compareDamarisFiles)
set(oneValueArgs CASENAME FILENAME SIMULATOR ABS_TOL REL_TOL DIR DIR_PREFIX PREFIX MPI_PROCS)
set(oneValueArgs
CASENAME
FILENAME
DEV_SIMULATOR
SIMULATOR
ABS_TOL
REL_TOL
DIR
DIR_PREFIX
PREFIX
MPI_PROCS
)
set(multiValueArgs TEST_ARGS)
cmake_parse_arguments(PARAM "$" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
if(NOT PARAM_DIR)
@@ -371,6 +482,9 @@ function(add_test_compareDamarisFiles)
else()
set(MPI_PROCS 4)
endif()
if(USE_DEV_SIMULATOR_IN_TESTS AND PARAM_DEV_SIMULATOR)
set(PARAM_SIMULATOR ${PARAM_DEV_SIMULATOR})
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_DIR}
@@ -436,68 +550,163 @@ endif()
# Simple execution tests
opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-test.sh "")
add_test_runSimulator(CASENAME norne
FILENAME NORNE_ATW2013
SIMULATOR flow
CONFIGURATION extra)
add_test_runSimulator(
CASENAME
norne
FILENAME
NORNE_ATW2013
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
CONFIGURATION
extra
)
add_test_runSimulator(CASENAME norne_parallel
FILENAME NORNE_ATW2013
SIMULATOR flow
DIR norne
PROCS 4
CONFIGURATION extra)
add_test_runSimulator(
CASENAME
norne_parallel
FILENAME
NORNE_ATW2013
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
DIR
norne
PROCS
4
CONFIGURATION
extra
)
add_test_runSimulator(CASENAME spe1case1_carfin
FILENAME SPE1CASE1_CARFIN
SIMULATOR flow
DIR lgr
TEST_ARGS --parsing-strictness=low --enable-ecl-output=true --enable-vtk-output=true)
add_test_runSimulator(
CASENAME
spe1case1_carfin
FILENAME
SPE1CASE1_CARFIN
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
DIR
lgr
TEST_ARGS
--parsing-strictness=low
--enable-ecl-output=true
--enable-vtk-output=true
)
add_test_runSimulator(CASENAME spe1case1_carfin_gr
FILENAME SPE1CASE1_CARFIN_GR
SIMULATOR flow
DIR lgr
TEST_ARGS --parsing-strictness=low --enable-ecl-output=true --enable-vtk-output=true)
add_test_runSimulator(
CASENAME
spe1case1_carfin_gr
FILENAME
SPE1CASE1_CARFIN_GR
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
DIR
lgr
TEST_ARGS
--parsing-strictness=low
--enable-ecl-output=true
--enable-vtk-output=true
)
if(MPI_FOUND)
add_test_runSimulator(CASENAME spe1case1_carfin_parallel
FILENAME SPE1CASE1_CARFIN
SIMULATOR flow
DIR lgr
PROCS 4
TEST_ARGS --parsing-strictness=low --enable-ecl-output=false --enable-vtk-output=true)
add_test_runSimulator(
CASENAME
spe1case1_carfin_parallel
FILENAME
SPE1CASE1_CARFIN
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
DIR
lgr
PROCS
4
TEST_ARGS
--parsing-strictness=low
--enable-ecl-output=false
--enable-vtk-output=true
)
endif()
add_test_runSimulator(CASENAME dryrun
FILENAME CO2STORE_PRECSALT
SIMULATOR flow
DIR co2store
TEST_ARGS --enable-dry-run=true --enable-ecl-output=false --enable-vtk-output=true)
add_test_runSimulator(
CASENAME
dryrun
FILENAME
CO2STORE_PRECSALT
SIMULATOR
flow
DEV_SIMULATOR
flow_brine_precsalt_vapwat
DIR
co2store
TEST_ARGS
--enable-dry-run=true
--enable-ecl-output=false
--enable-vtk-output=true
)
# Tests that are run based on simulator results, but not necessarily direct comparison to reference results
add_test_runSimulator(CASENAME tuning_trgmbe
FILENAME 01_TUNING_TRGMBE
SIMULATOR flow
DIR tuning
TEST_ARGS --output-extra-convergence-info=iterations --enable-tuning=true
POST_COMMAND $<TARGET_FILE:test_tuning_trgmbe>)
add_test_runSimulator(
CASENAME
tuning_trgmbe
FILENAME
01_TUNING_TRGMBE
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
DIR
tuning
TEST_ARGS
--output-extra-convergence-info=iterations
--enable-tuning=true
POST_COMMAND
$<TARGET_FILE:test_tuning_trgmbe>
)
add_test_runSimulator(CASENAME notuning_trgmbe
FILENAME 01_TUNING_TRGMBE
SIMULATOR flow
DIR tuning
TEST_ARGS --output-extra-convergence-info=iterations --enable-tuning=false
POST_COMMAND $<TARGET_FILE:test_tuning_trgmbe>)
add_test_runSimulator(
CASENAME
notuning_trgmbe
FILENAME
01_TUNING_TRGMBE
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
DIR
tuning
TEST_ARGS
--output-extra-convergence-info=iterations
--enable-tuning=false
POST_COMMAND
$<TARGET_FILE:test_tuning_trgmbe>
)
set_tests_properties(runSimulator/notuning_trgmbe PROPERTIES WILL_FAIL TRUE)
add_test_runSimulator(CASENAME tuning_tsinit_nextstep
FILENAME 02_TUNING_TSINIT_NEXTSTEP
SIMULATOR flow
DIR tuning
TEST_ARGS --enable-tuning=true
POST_COMMAND $<TARGET_FILE:test_tuning_tsinit_nextstep>)
add_test_runSimulator(
CASENAME
tuning_tsinit_nextstep
FILENAME
02_TUNING_TSINIT_NEXTSTEP
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
DIR
tuning
TEST_ARGS
--enable-tuning=true
POST_COMMAND
$<TARGET_FILE:test_tuning_tsinit_nextstep>
)
get_property(opm-common_EMBEDDED_PYTHON TARGET opmcommon PROPERTY EMBEDDED_PYTHON)
if (opm-common_EMBEDDED_PYTHON)
@@ -509,68 +718,111 @@ include (${CMAKE_CURRENT_SOURCE_DIR}/restartTests.cmake)
# PORV test
opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-porv-acceptanceTest.sh "")
add_test_compareECLFiles(CASENAME norne
FILENAME NORNE_ATW2013
SIMULATOR flow
ABS_TOL 1e-5
REL_TOL 1e-8
PREFIX comparePORV
DIR_PREFIX /porv)
add_test_compareECLFiles(
CASENAME
norne
FILENAME
NORNE_ATW2013
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
ABS_TOL
1e-5
REL_TOL
1e-8
PREFIX
comparePORV
DIR_PREFIX
/porv
)
# Init tests
opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-init-regressionTest.sh "")
add_test_compareECLFiles(CASENAME norne_init
FILENAME NORNE_ATW2013
SIMULATOR flow
ABS_TOL ${abs_tol}
REL_TOL ${rel_tol}
PREFIX compareECLInitFiles
DIR norne
DIR_PREFIX /init)
add_test_compareECLFiles(
CASENAME
norne_init
FILENAME
NORNE_ATW2013
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
ABS_TOL
${abs_tol}
REL_TOL
${rel_tol}
PREFIX
compareECLInitFiles
DIR
norne
DIR_PREFIX
/init
)
set(_operate_work_tests
OPERATE_ENDPOINTS-01
OPERATER_ENDPOINTS-01
)
add_multiple_tests(_operate_work_tests
add_multiple_tests(
_operate_work_tests
"operate_work_"
SIMULATOR flow
ABS_TOL ${abs_tol}
REL_TOL ${rel_tol}
PREFIX compareECLInitFiles
DIR operate
DIR_PREFIX /init
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
ABS_TOL
${abs_tol}
REL_TOL
${rel_tol}
PREFIX
compareECLInitFiles
DIR
operate
DIR_PREFIX
/init
)
# This is not a proper regression test; the test will load a norne case prepared
# for restart and run one single timestep - of length one day. The results are not
# verified in any way.
add_test(NAME NORNE_RESTART
COMMAND flow --output-dir=${BASE_RESULT_PATH}/norne-restart ${OPM_TESTS_ROOT}/norne/NORNE_ATW2013_RESTART.DATA)
if(MPI_FOUND)
include (${CMAKE_CURRENT_SOURCE_DIR}/parallelRestartTests.cmake)
# Single test to verify that we treat custom communicators correctly.
opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-split-comm-test.sh "")
add_test_split_comm(CASENAME spe1
FILENAME SPE1CASE2
SIMULATOR flow
ABS_TOL 0.0
REL_TOL 0.0)
add_test_split_comm(
CASENAME
spe1
FILENAME
SPE1CASE2
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
ABS_TOL
0.0
REL_TOL
0.0
)
# Single test for damaris
if(Damaris_FOUND AND USE_DAMARIS_LIB)
opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-damaris-regressionTest.sh "")
add_test_compareDamarisFiles(CASENAME spe1_damaris
FILENAME SPE1CASE1
SIMULATOR flow
ABS_TOL ${abs_tol}
REL_TOL 0.01
DIR spe1)
add_test_compareDamarisFiles(
CASENAME
spe1_damaris
FILENAME
SPE1CASE1
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
ABS_TOL
${abs_tol}
REL_TOL
0.01
DIR
spe1
)
endif()
include (${CMAKE_CURRENT_SOURCE_DIR}/parallelTests.cmake)
comparisonTests.cmake
+24 -11
View File
@@ -7,14 +7,27 @@ set(rel_tol 1e-5)
set(coarse_rel_tol 1e-2)
# Tests comparing VFPTABLE oneliner vs multiliner lift curves (constant delta pressure)
add_test_compareSeparateECLFiles(CASENAME spe1_metric_vfp1_multiliner_vs_oneliner
DIR1 vfpprod_spe1_oneliner
FILENAME1 SPE1CASE1_METRIC_VFP1_MULTILINER
DIR2 vfpprod_spe1_oneliner
FILENAME2 SPE1CASE1_METRIC_VFP1_ONELINER
SIMULATOR flow
ABS_TOL ${abs_tol}
REL_TOL ${rel_tol}
IGNORE_EXTRA_KW BOTH
MPI_PROCS 1)
add_test_compareSeparateECLFiles(
CASENAME
spe1_metric_vfp1_multiliner_vs_oneliner
DIR1
vfpprod_spe1_oneliner
FILENAME1
SPE1CASE1_METRIC_VFP1_MULTILINER
DIR2
vfpprod_spe1_oneliner
FILENAME2
SPE1CASE1_METRIC_VFP1_ONELINER
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
ABS_TOL
${abs_tol}
REL_TOL
${rel_tol}
IGNORE_EXTRA_KW
BOTH
MPI_PROCS
1
)
parallelRestartTests.cmake
+185 -65
View File
@@ -1,78 +1,198 @@
# Parallel tests
opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-parallel-restart-regressionTest.sh "")
add_test_compare_parallel_restarted_simulation(CASENAME spe1
FILENAME SPE1CASE2_ACTNUM
SIMULATOR flow
ABS_TOL ${abs_tol_restart}
REL_TOL ${rel_tol_restart}
RESTART_STEP 6
TEST_ARGS --sched-restart=false --enable-adaptive-time-stepping=false)
add_test_compare_parallel_restarted_simulation(
CASENAME
spe1
FILENAME
SPE1CASE2_ACTNUM
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
ABS_TOL
${abs_tol_restart}
REL_TOL
${rel_tol_restart}
RESTART_STEP
6
TEST_ARGS
--sched-restart=false
--enable-adaptive-time-stepping=false
)
add_test_compare_parallel_restarted_simulation(CASENAME ctaquifer_2d_oilwater
FILENAME 2D_OW_CTAQUIFER
SIMULATOR flow
ABS_TOL ${abs_tol_restart}
REL_TOL ${rel_tol_restart}
RESTART_STEP 15
DIR aquifer-oilwater
TEST_ARGS --enable-tuning=true --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-6 --enable-adaptive-time-stepping=false)
add_test_compare_parallel_restarted_simulation(
CASENAME
ctaquifer_2d_oilwater
FILENAME
2D_OW_CTAQUIFER
SIMULATOR
flow
DEV_SIMULATOR
flow_oilwater
ABS_TOL
${abs_tol_restart}
REL_TOL
${rel_tol_restart}
RESTART_STEP
15
DIR
aquifer-oilwater
TEST_ARGS
--enable-tuning=true
--linear-solver-reduction=1e-7
--tolerance-cnv=5e-6
--tolerance-mb=1e-6
--enable-adaptive-time-stepping=false
)
add_test_compare_parallel_restarted_simulation(CASENAME fetkovich_2d
FILENAME 2D_FETKOVICHAQUIFER
SIMULATOR flow
ABS_TOL ${abs_tol_restart}
REL_TOL ${rel_tol_restart}
RESTART_STEP 30
DIR aquifer-fetkovich
TEST_ARGS --enable-tuning=true --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-6 --enable-adaptive-time-stepping=false)
add_test_compare_parallel_restarted_simulation(
CASENAME
fetkovich_2d
FILENAME
2D_FETKOVICHAQUIFER
SIMULATOR
flow
DEV_SIMULATOR
flow_oilwater
ABS_TOL
${abs_tol_restart}
REL_TOL
${rel_tol_restart}
RESTART_STEP
30
DIR
aquifer-fetkovich
TEST_ARGS
--enable-tuning=true
--linear-solver-reduction=1e-7
--tolerance-cnv=5e-6
--tolerance-mb=1e-6
--enable-adaptive-time-stepping=false
)
add_test_compare_parallel_restarted_simulation(CASENAME numerical_aquifer_3d_2aqu
FILENAME 3D_2AQU_NUM
SIMULATOR flow
ABS_TOL 0.12
REL_TOL 5.0e-2
RESTART_STEP 3
DIR aquifer-num
TEST_ARGS --enable-tuning=true --tolerance-cnv=0.00003 --time-step-control=pid --linear-solver=cpr_trueimpes --enable-adaptive-time-stepping=false)
add_test_compare_parallel_restarted_simulation(
CASENAME
numerical_aquifer_3d_2aqu
FILENAME
3D_2AQU_NUM
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
ABS_TOL
0.12
REL_TOL
5.0e-2
RESTART_STEP
3
DIR
aquifer-num
TEST_ARGS
--enable-tuning=true
--tolerance-cnv=0.00003
--time-step-control=pid
--linear-solver=cpr_trueimpes
--enable-adaptive-time-stepping=false
)
add_test_compare_parallel_restarted_simulation(CASENAME numerical_aquifer_3d_1aqu
FILENAME 3D_1AQU_3CELLS
SIMULATOR flow
ABS_TOL 0.12
REL_TOL 5.0e-2
RESTART_STEP 3
DIR aquifer-num
TEST_ARGS --enable-tuning=true --tolerance-cnv=0.00003 --time-step-control=pid --linear-solver=cpr_trueimpes --enable-adaptive-time-stepping=false)
add_test_compare_parallel_restarted_simulation(
CASENAME
numerical_aquifer_3d_1aqu
FILENAME
3D_1AQU_3CELLS
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
ABS_TOL
0.12
REL_TOL
5.0e-2
RESTART_STEP
3
DIR
aquifer-num
TEST_ARGS
--enable-tuning=true
--tolerance-cnv=0.00003
--time-step-control=pid
--linear-solver=cpr_trueimpes
--enable-adaptive-time-stepping=false
)
add_test_compare_parallel_restarted_simulation(CASENAME aquflux_01
FILENAME AQUFLUX-01
SIMULATOR flow
ABS_TOL ${abs_tol_restart}
REL_TOL 5.0e-2
RESTART_STEP 3
DIR aquifers
TEST_ARGS --solver-max-time-step-in-days=1)
add_test_compare_parallel_restarted_simulation(
CASENAME
aquflux_01
FILENAME
AQUFLUX-01
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
ABS_TOL
${abs_tol_restart}
REL_TOL
5.0e-2
RESTART_STEP
3
DIR
aquifers
TEST_ARGS
--solver-max-time-step-in-days=1
)
add_test_compare_parallel_restarted_simulation(CASENAME aquflux_02
FILENAME AQUFLUX-02
SIMULATOR flow
ABS_TOL ${abs_tol_restart}
REL_TOL 5.0e-2
RESTART_STEP 50
DIR aquifers
TEST_ARGS --solver-max-time-step-in-days=1)
add_test_compare_parallel_restarted_simulation(
CASENAME
aquflux_02
FILENAME
AQUFLUX-02
SIMULATOR
flow
DEV_SIMULATOR
flow_oilwater
ABS_TOL
${abs_tol_restart}
REL_TOL
5.0e-2
RESTART_STEP
50
DIR
aquifers
TEST_ARGS
--solver-max-time-step-in-days=1
)
# Serialized restart tests
if(HDF5_FOUND)
opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-serialization-regressionTest.sh "")
add_test_compare_parallel_restarted_simulation(CASENAME spe1_serialized
DIR spe1
FILENAME SPE1CASE1
SIMULATOR flow
TEST_NAME compareParallelSerializedSim_flow+spe1
ABS_TOL 2e-2
REL_TOL 1e-5
RESTART_STEP 94
TEST_ARGS --tolerance-mb=1e-7 --linear-solver=ilu0
MPI_PROCS 4)
if(USE_DEV_SIMULATOR_IN_TESTS)
set(RESTART_SIM flow_blackoil)
else()
set(RESTART_SIM flow)
endif()
add_test_compare_parallel_restarted_simulation(
CASENAME
spe1_serialized
DIR
spe1
FILENAME
SPE1CASE1
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
TEST_NAME
compareParallelSerializedSim_${RESTART_SIM}+spe1
ABS_TOL
2e-2
REL_TOL
1e-5
RESTART_STEP
94
MPI_PROCS
4
TEST_ARGS
--tolerance-mb=1e-7
--linear-solver=ilu0
)
endif()
parallelTests.cmake
+985 -397
View File
File diff suppressed because it is too large. Load diff
pyactionActionXComparisons.cmake
+856 -354
View File
File diff suppressed because it is too large. Load diff
regressionTests.cmake
+2305 -810
View File
File diff suppressed because it is too large. Load diff
restartTests.cmake
+323 -119
View File
@@ -4,114 +4,279 @@ opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-restart-regressionTest.sh ""
set(abs_tol_restart 2e-1)
set(rel_tol_restart 4e-4)
add_test_compare_restarted_simulation(CASENAME spe1
FILENAME SPE1CASE2_ACTNUM
SIMULATOR flow
ABS_TOL ${abs_tol_restart}
REL_TOL ${rel_tol_restart}
RESTART_STEP 6
TEST_ARGS --sched-restart=false)
# This is not a proper regression test; the test will load a norne case prepared
# for restart and run one single timestep - of length one day. The results are not
# verified in any way.
if(USE_DEV_SIMULATOR_IN_TESTS)
set(RESTART_SIM flow_blackoil)
else()
set(RESTART_SIM flow)
endif()
add_test_compare_restarted_simulation(CASENAME spe9
FILENAME SPE9_CP_SHORT
SIMULATOR flow
ABS_TOL ${abs_tol_restart}
REL_TOL ${rel_tol_restart}
RESTART_STEP 15
TEST_ARGS --sched-restart=false --tolerance-mb=1e-7)
add_test(
NAME
NORNE_RESTART
COMMAND
${RESTART_SIM}
--output-dir=${BASE_RESULT_PATH}/norne-restart
${OPM_TESTS_ROOT}/norne/NORNE_ATW2013_RESTART.DATA
)
add_test_compare_restarted_simulation(CASENAME ctaquifer_2d_oilwater
FILENAME 2D_OW_CTAQUIFER
SIMULATOR flow
ABS_TOL ${abs_tol_restart}
REL_TOL ${rel_tol_restart}
DIR aquifer-oilwater
RESTART_STEP 15
TEST_ARGS --sched-restart=true)
add_test_compare_restarted_simulation(
CASENAME
spe1
FILENAME
SPE1CASE2_ACTNUM
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
ABS_TOL
${abs_tol_restart}
REL_TOL
${rel_tol_restart}
RESTART_STEP
6
TEST_ARGS
--sched-restart=false
)
add_test_compare_restarted_simulation(CASENAME fetkovich_2d
FILENAME 2D_FETKOVICHAQUIFER
SIMULATOR flow
ABS_TOL ${abs_tol_restart}
REL_TOL ${rel_tol_restart}
RESTART_STEP 30
DIR aquifer-fetkovich
TEST_ARGS --sched-restart=true)
add_test_compare_restarted_simulation(
CASENAME
spe9
FILENAME
SPE9_CP_SHORT
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
ABS_TOL
${abs_tol_restart}
REL_TOL
${rel_tol_restart}
RESTART_STEP
15
TEST_ARGS
--sched-restart=false
--tolerance-mb=1e-7
)
add_test_compare_restarted_simulation(CASENAME numerical_aquifer_3d_1aqu
FILENAME 3D_1AQU_3CELLS
SIMULATOR flow
ABS_TOL 0.4
REL_TOL 4.0e-3
RESTART_STEP 3
DIR aquifer-num
TEST_ARGS --enable-tuning=true --relaxed-max-pv-fraction=0.0 --enable-drift-compensation=false)
add_test_compare_restarted_simulation(
CASENAME
ctaquifer_2d_oilwater
FILENAME
2D_OW_CTAQUIFER
SIMULATOR
flow
DEV_SIMULATOR
flow_oilwater
ABS_TOL
${abs_tol_restart}
REL_TOL
${rel_tol_restart}
DIR
aquifer-oilwater
RESTART_STEP
15
TEST_ARGS
--sched-restart=true
)
add_test_compare_restarted_simulation(CASENAME numerical_aquifer_3d_2aqu
FILENAME 3D_2AQU_NUM
SIMULATOR flow
ABS_TOL 0.4
REL_TOL 4.0e-3
RESTART_STEP 3
DIR aquifer-num
TEST_ARGS --sched-restart=true --enable-tuning=true)
add_test_compare_restarted_simulation(
CASENAME
fetkovich_2d
FILENAME
2D_FETKOVICHAQUIFER
SIMULATOR
flow
DEV_SIMULATOR
flow_oilwater
ABS_TOL
${abs_tol_restart}
REL_TOL
${rel_tol_restart}
RESTART_STEP
30
DIR
aquifer-fetkovich
TEST_ARGS
--sched-restart=true
)
add_test_compare_restarted_simulation(CASENAME aquflux_01
FILENAME AQUFLUX-01
SIMULATOR flow
ABS_TOL ${abs_tol_restart}
REL_TOL 3.0e-3
RESTART_STEP 3
DIR aquifers
TEST_ARGS --enable-tuning=true)
add_test_compare_restarted_simulation(
CASENAME
numerical_aquifer_3d_1aqu
FILENAME
3D_1AQU_3CELLS
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
ABS_TOL
0.4
REL_TOL
4.0e-3
RESTART_STEP
3
DIR
aquifer-num
TEST_ARGS
--enable-tuning=true
--relaxed-max-pv-fraction=0.0
--enable-drift-compensation=false
)
add_test_compare_restarted_simulation(CASENAME aquflux_02
FILENAME AQUFLUX-02
SIMULATOR flow
ABS_TOL ${abs_tol_restart}
REL_TOL ${rel_tol_restart}
RESTART_STEP 50
DIR aquifers
TEST_ARGS --enable-tuning=true)
add_test_compare_restarted_simulation(
CASENAME
numerical_aquifer_3d_2aqu
FILENAME
3D_2AQU_NUM
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
ABS_TOL
0.4
REL_TOL
4.0e-3
RESTART_STEP
3
DIR
aquifer-num
TEST_ARGS
--sched-restart=true
--enable-tuning=true
)
add_test_compare_restarted_simulation(CASENAME network_01_restart
FILENAME NETWORK-01-RESTART
SIMULATOR flow
ABS_TOL ${abs_tol_restart}
REL_TOL ${rel_tol_restart}
RESTART_STEP 5
DIR network
TEST_ARGS --enable-tuning=true --local-well-solve-control-switching=true)
add_test_compare_restarted_simulation(
CASENAME
aquflux_01
FILENAME
AQUFLUX-01
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
ABS_TOL
${abs_tol_restart}
REL_TOL
3.0e-3
RESTART_STEP
3
DIR
aquifers
TEST_ARGS
--enable-tuning=true
)
add_test_compare_restarted_simulation(CASENAME network_01_reroute_restart
FILENAME NETWORK-01-REROUTE-RESTART
SIMULATOR flow
ABS_TOL ${abs_tol_restart}
REL_TOL ${rel_tol_restart}
RESTART_STEP 5
DIR network
TEST_ARGS --enable-tuning=true --local-well-solve-control-switching=true)
add_test_compare_restarted_simulation(
CASENAME
aquflux_02
FILENAME
AQUFLUX-02
SIMULATOR
flow
DEV_SIMULATOR
flow_oilwater
ABS_TOL
${abs_tol_restart}
REL_TOL
${rel_tol_restart}
RESTART_STEP
50
DIR
aquifers
TEST_ARGS
--enable-tuning=true
)
add_test_compare_restarted_simulation(CASENAME spe1_temp
FILENAME SPE1CASE2_TEMP
SIMULATOR flow
ABS_TOL ${abs_tol_restart}
REL_TOL 5.0e-2
RESTART_STEP 3
DIR spe1
TEST_ARGS --solver-max-time-step-in-days=1)
add_test_compare_restarted_simulation(
CASENAME
network_01_restart
FILENAME
NETWORK-01-RESTART
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
ABS_TOL
${abs_tol_restart}
REL_TOL
${rel_tol_restart}
RESTART_STEP
5
DIR
network
TEST_ARGS
--enable-tuning=true
--local-well-solve-control-switching=true
)
add_test_compare_restarted_simulation(
CASENAME
network_01_reroute_restart
FILENAME
NETWORK-01-REROUTE-RESTART
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
ABS_TOL
${abs_tol_restart}
REL_TOL
${rel_tol_restart}
RESTART_STEP
5
DIR
network
TEST_ARGS
--enable-tuning=true
--local-well-solve-control-switching=true
)
add_test_compare_restarted_simulation(
CASENAME
spe1_temp
FILENAME
SPE1CASE2_TEMP
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil_temp
ABS_TOL
${abs_tol_restart}
REL_TOL
5.0e-2
RESTART_STEP
3
DIR
spe1
TEST_ARGS
--solver-max-time-step-in-days=1
)
# Restart run in which a UDQ defining expression has exactly 128
# characters. Verifies that we don't overflow the ZUDL character
# limit in restart files.
add_test_compare_restarted_simulation(CASENAME udq_reg_02
FILENAME UDQ_REG-02
SIMULATOR flow
ABS_TOL ${abs_tol_restart}
REL_TOL ${rel_tol_restart}
RESTART_STEP 2
DIR udq_actionx
TEST_ARGS --enable-tuning=true
add_test_compare_restarted_simulation(
CASENAME
udq_reg_02
FILENAME
UDQ_REG-02
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
ABS_TOL
${abs_tol_restart}
REL_TOL
${rel_tol_restart}
RESTART_STEP
2
DIR
udq_actionx
TEST_ARGS
--enable-tuning=true
)
# The dynamic MSW data is not written to /read from the restart file
@@ -121,39 +286,78 @@ add_test_compare_restarted_simulation(CASENAME udq_reg_02
set(abs_tol_restart_msw 2e2)
set(rel_tol_restart_msw 1e-3)
add_test_compare_restarted_simulation(CASENAME msw_3d_hfa
FILENAME 3D_MSW
SIMULATOR flow
ABS_TOL ${abs_tol_restart_msw}
REL_TOL ${rel_tol_restart_msw}
RESTART_STEP 10
TEST_ARGS --enable-adaptive-time-stepping=false --sched-restart=true --tolerance-wells=1e-7)
add_test_compare_restarted_simulation(
CASENAME
msw_3d_hfa
FILENAME
3D_MSW
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
ABS_TOL
${abs_tol_restart_msw}
REL_TOL
${rel_tol_restart_msw}
RESTART_STEP
10
TEST_ARGS
--enable-adaptive-time-stepping=false
--sched-restart=true
--tolerance-wells=1e-7
)
# Basic restart tests which only compare the summary output, this test driver should
# only be used in situations where it is challenging to get agreement in the restart file.
opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-summary-restart-regressionTest.sh "")
add_test_compare_restarted_simulation(CASENAME spe1_actnum
FILENAME SPE1CASE2_ACTNUM
SIMULATOR flow
TEST_NAME restart_spe1_summary
ABS_TOL ${abs_tol_restart}
REL_TOL ${rel_tol_restart}
RESTART_STEP 6
TEST_ARGS --sched-restart=false
DIR spe1)
add_test_compare_restarted_simulation(
CASENAME
spe1_actnum
FILENAME
SPE1CASE2_ACTNUM
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
TEST_NAME
restart_spe1_summary
ABS_TOL
${abs_tol_restart}
REL_TOL
${rel_tol_restart}
RESTART_STEP
6
DIR
spe1
TEST_ARGS
--sched-restart=false
)
# Serialized restart tests
if(HDF5_FOUND)
opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-serialization-regressionTest.sh "")
add_test_compare_restarted_simulation(CASENAME spe1_serialized
DIR spe1
FILENAME SPE1CASE1
SIMULATOR flow
TEST_NAME compareSerializedSim_flow+spe1
ABS_TOL 2e-2
REL_TOL 1e-5
RESTART_STEP 94
TEST_ARGS --tolerance-mb=1e-7)
add_test_compare_restarted_simulation(
CASENAME
spe1_serialized
DIR
spe1
FILENAME
SPE1CASE1
SIMULATOR
flow
DEV_SIMULATOR
flow_blackoil
TEST_NAME
compareSerializedSim_${RESTART_SIM}+spe1
ABS_TOL
2e-2
REL_TOL
1e-5
RESTART_STEP
94
TEST_ARGS
--tolerance-mb=1e-7
)
endif()
tests/run-damaris-regressionTest.sh
+7 -3
View File
@@ -17,12 +17,13 @@ then
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"
echo -e "\t\t -u <filename> Simulator binary for reference data"
exit 1
fi
MPI_PROCS=4
OPTIND=1
while getopts "i:r:b:f:a:t:c:e:n:" OPT
while getopts "i:r:b:f:a:t:c:e:n:u:" OPT
do
case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;;
@@ -34,11 +35,14 @@ do
c) H5DIFF_COMMAND=${OPTARG} ;;
e) EXE_NAME=${OPTARG} ;;
n) MPI_PROCS=${OPTARG} ;;
u) REF_EXE_NAME=${OPTARG} ;;
esac
done
shift $(($OPTIND-1))
TEST_ARGS="$@"
REF_EXE_NAME=${REF_EXE_NAME:-${EXE_NAME}}
mkdir -p ${RESULT_PATH}
cd ${RESULT_PATH}
mpirun -np ${MPI_PROCS} ${BINPATH}/${EXE_NAME} ${INPUT_DATA_PATH}/${FILENAME} ${TEST_ARGS} --output-dir=${RESULT_PATH} --damaris-dedicated-cores=1 --damaris-save-mesh-to-hdf=true --enable-damaris-output=true --enable-ecl-output=false --damaris-output-hdf-collective=1 --damaris-save-to-hdf=1 --damaris-sim-name="${FILENAME}"
@@ -49,10 +53,10 @@ echo "=== Executing comparison for files if these exists in reference folder ===
for fname in `ls ${RESULT_PATH}/${FILENAME}*.h5`
do
fname=`basename $fname`
if test -f ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${fname}
if test -f ${INPUT_DATA_PATH}/opm-simulation-reference/${REF_EXE_NAME}/${fname}
then
echo -e "\t - ${fname}"
h5diffout=$(${H5DIFF_COMMAND} --relative=${REL_TOL} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${fname} ${RESULT_PATH}/${fname})
h5diffout=$(${H5DIFF_COMMAND} --relative=${REL_TOL} ${INPUT_DATA_PATH}/opm-simulation-reference/${REF_EXE_NAME}/${fname} ${RESULT_PATH}/${fname})
if [ -n "${h5diffout}" ]; then
exit 1
fi
tests/run-init-regressionTest.sh
+8 -3
View File
@@ -18,11 +18,13 @@ then
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 -u <filename> Simulator binary for reference data"
exit 1
fi
OPTIND=1
while getopts "i:r:b:f:a:t:c:e:d:h:" OPT
while getopts "i:r:b:f:a:t:c:e:d:h:u:" OPT
do
case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;;
@@ -35,11 +37,14 @@ do
e) EXE_NAME=${OPTARG} ;;
d) ;; # Ignored
h) ;; # Ignored#
u) REF_EXE_NAME=${OPTARG} ;;
esac
done
shift $(($OPTIND-1))
TEST_ARGS="$@"
REF_EXE_NAME=${REF_EXE_NAME:-${EXE_NAME}}
rm -Rf ${RESULT_PATH}
mkdir -p ${RESULT_PATH}
cd ${RESULT_PATH}
@@ -47,11 +52,11 @@ ${BINPATH}/${EXE_NAME} ${TEST_ARGS} --enable-dry-run=true --output-dir=${RESULT_
cd ..
ecode=0
${COMPARE_ECL_COMMAND} -t INIT ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL}
${COMPARE_ECL_COMMAND} -t INIT ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${REF_EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL}
if [ $? -ne 0 ]
then
ecode=1
${COMPARE_ECL_COMMAND} -a -t INIT ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL}
${COMPARE_ECL_COMMAND} -a -t INIT ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${REF_EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL}
fi
exit $ecode
tests/run-porv-acceptanceTest.sh
+8 -3
View File
@@ -18,11 +18,13 @@ then
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 -u <filename> Simulator binary for reference data"
exit 1
fi
OPTIND=1
while getopts "i:r:b:f:a:t:c:e:d:h:" OPT
while getopts "i:r:b:f:a:t:c:e:d:h:u:" OPT
do
case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;;
@@ -35,11 +37,14 @@ do
e) EXE_NAME=${OPTARG} ;;
d) ;; # Ignored
h) ;; # Ignored
u) REF_EXE_NAME=${OPTARG} ;;
esac
done
shift $(($OPTIND-1))
TEST_ARGS="$@"
REF_EXE_NAME=${REF_EXE_NAME:-${EXE_NAME}}
rm -Rf ${RESULT_PATH}
mkdir -p ${RESULT_PATH}
cd ${RESULT_PATH}
@@ -47,11 +52,11 @@ ${BINPATH}/${EXE_NAME} ${TEST_ARGS} --enable-dry-run=true --output-dir=${RESULT_
cd ..
ecode=0
${COMPARE_ECL_COMMAND} -t INIT -k PORV ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-porevolume-reference/${EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL}
${COMPARE_ECL_COMMAND} -t INIT -k PORV ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-porevolume-reference/${REF_EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL}
if [ $? -ne 0 ]
then
ecode=1
${COMPARE_ECL_COMMAND} -a -t INIT -k PORV ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-porevolume-reference/${EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL}
${COMPARE_ECL_COMMAND} -a -t INIT -k PORV ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-porevolume-reference/${REF_EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL}
fi
exit $ecode
tests/run-regressionTest.sh
+9 -5
View File
@@ -19,12 +19,13 @@ then
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"
echo -e "\t\t -u <filename> Simulator binary for reference data"
exit 1
fi
RESTART_STEP=""
OPTIND=1
while getopts "i:r:b:f:a:t:c:d:s:e:h:" OPT
while getopts "i:r:b:f:a:t:c:d:s:e:h:u:" OPT
do
case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;;
@@ -38,11 +39,14 @@ do
s) RESTART_STEP=${OPTARG} ;;
e) EXE_NAME=${OPTARG} ;;
h) RESTART_SCHED=${OPTARG} ;;
u) REF_EXE_NAME=${OPTARG} ;;
esac
done
shift $(($OPTIND-1))
TEST_ARGS="$@"
REF_EXE_NAME=${REF_EXE_NAME:-${EXE_NAME}}
mkdir -p ${RESULT_PATH}
cd ${RESULT_PATH}
@@ -81,11 +85,11 @@ else
echo "=== Executing comparison for EGRID, INIT, UNRST, UNSMRY and RFT files if these exists in reference folder ==="
fi
${COMPARE_ECL_COMMAND} ${ignore_extra_kw} ${type} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${RESULT_PATH}/${FILENAME} ${ABS_TOL} ${REL_TOL}
${COMPARE_ECL_COMMAND} ${ignore_extra_kw} ${type} ${INPUT_DATA_PATH}/opm-simulation-reference/${REF_EXE_NAME}/${FILENAME} ${RESULT_PATH}/${FILENAME} ${ABS_TOL} ${REL_TOL}
if [ $? -ne 0 ]
then
ecode=1
${COMPARE_ECL_COMMAND} ${ignore_extra_kw} ${type} -a ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${RESULT_PATH}/${FILENAME} ${ABS_TOL} ${REL_TOL}
${COMPARE_ECL_COMMAND} ${ignore_extra_kw} ${type} -a ${INPUT_DATA_PATH}/opm-simulation-reference/${REF_EXE_NAME}/${FILENAME} ${RESULT_PATH}/${FILENAME} ${ABS_TOL} ${REL_TOL}
fi
RSTEPS=(${RESTART_STEP//,/ })
@@ -110,11 +114,11 @@ do
else
echo "=== Executing comparison for EGRID, INIT, UNRST, UNSMRY and RFT files for restarted run ==="
fi
${COMPARE_ECL_COMMAND} ${ignore_extra_kw} ${type} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/restart/${FILENAME}_RESTART_${STEP} ${RESULT_PATH}/restart/${FILENAME}_RESTART_${STEP} ${ABS_TOL} ${REL_TOL}
${COMPARE_ECL_COMMAND} ${ignore_extra_kw} ${type} ${INPUT_DATA_PATH}/opm-simulation-reference/${REF_EXE_NAME}/restart/${FILENAME}_RESTART_${STEP} ${RESULT_PATH}/restart/${FILENAME}_RESTART_${STEP} ${ABS_TOL} ${REL_TOL}
if [ $? -ne 0 ]
then
ecode=1
${COMPARE_ECL_COMMAND} ${ignore_extra_kw} ${type} -a ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/restart/${FILENAME}_RESTART_${STEP} ${RESULT_PATH}/restart/${FILENAME}_RESTART_${STEP} ${ABS_TOL} ${REL_TOL}
${COMPARE_ECL_COMMAND} ${ignore_extra_kw} ${type} -a ${INPUT_DATA_PATH}/opm-simulation-reference/${REF_EXE_NAME}/restart/${FILENAME}_RESTART_${STEP} ${RESULT_PATH}/restart/${FILENAME}_RESTART_${STEP} ${ABS_TOL} ${REL_TOL}
fi
done