Resolved merge conflict

This commit is contained in:
Erik Hide Saeternes 2024-09-23 22:31:47 +02:00
parent 7caffa44b0
commit 6b7fc8b54b

View File

@ -201,8 +201,8 @@ add_test_compare_parallel_simulation(CASENAME 3_a_mpi_multflt_mod2
FILENAME 3_A_MPI_MULTFLT_SCHED_MODEL2
SIMULATOR flow
ABS_TOL ${abs_tol_parallel}
REL_TOL 1.0e-4
DIR model2
REL_TOL 1.0e-3
DIR model2
TEST_ARGS --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8 --enable-drift-compensation=false)
add_test_compare_parallel_simulation(CASENAME rxft