Merge pull request #5810 from michal-toth/test/partition-method-3

Regression test for --partition-method=3
This commit is contained in:
Arne Morten Kvarving
2024-12-18 16:11:26 +01:00
committed by GitHub
2 changed files with 18 additions and 3 deletions

View File

@@ -194,7 +194,7 @@ endfunction()
# - This test class compares the output from a parallel simulation # - This test class compares the output from a parallel simulation
# to the output from the serial instance of the same model. # to the output from the serial instance of the same model.
function(add_test_compare_parallel_simulation) function(add_test_compare_parallel_simulation)
set(oneValueArgs CASENAME FILENAME SIMULATOR ABS_TOL REL_TOL DIR MPI_PROCS) set(oneValueArgs CASENAME FILENAME SIMULATOR ABS_TOL REL_TOL DIR POSTFIX MPI_PROCS)
set(multiValueArgs TEST_ARGS) set(multiValueArgs TEST_ARGS)
cmake_parse_arguments(PARAM "$" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) cmake_parse_arguments(PARAM "$" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
@@ -202,6 +202,12 @@ function(add_test_compare_parallel_simulation)
set(PARAM_DIR ${PARAM_CASENAME}) set(PARAM_DIR ${PARAM_CASENAME})
endif() endif()
if(NOT PARAM_POSTFIX)
set(PARAM_POSTFIX "")
else()
set(PARAM_POSTFIX +${PARAM_POSTFIX})
endif()
if(PARAM_MPI_PROCS) if(PARAM_MPI_PROCS)
set(MPI_PROCS ${PARAM_MPI_PROCS}) set(MPI_PROCS ${PARAM_MPI_PROCS})
else() else()
@@ -221,11 +227,11 @@ function(add_test_compare_parallel_simulation)
-n ${MPI_PROCS}) -n ${MPI_PROCS})
# 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}${PARAM_POSTFIX} NO_COMPILE
EXE_NAME ${PARAM_SIMULATOR} EXE_NAME ${PARAM_SIMULATOR}
DRIVER_ARGS ${DRIVER_ARGS} DRIVER_ARGS ${DRIVER_ARGS}
TEST_ARGS ${TEST_ARGS}) TEST_ARGS ${TEST_ARGS})
set_tests_properties(compareParallelSim_${PARAM_SIMULATOR}+${PARAM_FILENAME} set_tests_properties(compareParallelSim_${PARAM_SIMULATOR}+${PARAM_FILENAME}${PARAM_POSTFIX}
PROPERTIES PROCESSORS ${MPI_PROCS}) PROPERTIES PROCESSORS ${MPI_PROCS})
endfunction() endfunction()

View File

@@ -78,6 +78,15 @@ add_test_compare_parallel_simulation(CASENAME spe3
REL_TOL ${coarse_rel_tol_parallel} REL_TOL ${coarse_rel_tol_parallel}
TEST_ARGS --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8 --tolerance-wells=1e-7) TEST_ARGS --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8 --tolerance-wells=1e-7)
add_test_compare_parallel_simulation(CASENAME spe3_partition_method_3
FILENAME SPE3CASE1
POSTFIX partition_method_3
DIR spe3
SIMULATOR flow
ABS_TOL ${abs_tol_parallel}
REL_TOL ${coarse_rel_tol_parallel}
TEST_ARGS --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8 --tolerance-wells=1e-7 --partition-method=3)
add_test_compare_parallel_simulation(CASENAME spe1_solvent add_test_compare_parallel_simulation(CASENAME spe1_solvent
FILENAME SPE1CASE2_SOLVENT FILENAME SPE1CASE2_SOLVENT
SIMULATOR flow SIMULATOR flow