From 084e82b61056e745e5455b1f7cf2e6d9e1f350ff Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Thu, 10 Apr 2025 10:39:21 +0200 Subject: [PATCH] spe1 brine/precsalt tests: use multi-registration --- regressionTests.cmake | 62 +++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/regressionTests.cmake b/regressionTests.cmake index 7fb6d9f783..3329101243 100644 --- a/regressionTests.cmake +++ b/regressionTests.cmake @@ -97,19 +97,41 @@ add_multiple_tests( DIR spe1 ) -add_test_compareECLFiles(CASENAME spe1_brine - FILENAME SPE1CASE1_BRINE - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR spe1_brine) +set(_spe1_brine_tests + SPE1CASE1_BRINE + SPE1CASE2_BRINE_GASWATER +) -add_test_compareECLFiles(CASENAME spe1_precsalt - FILENAME SPE1CASE1_PRECSALT +add_multiple_tests( + _spe1_brine_tests + "" + SIMULATOR flow + ABS_TOL ${abs_tol} + REL_TOL ${rel_tol} + DIR spe1_brine +) + +set(_spe1_precsalt_tests + GASWATER_VAPWAT_PRECSALT + SPE1CASE1_PRECSALT +) + +add_multiple_tests( + _spe1_precsalt_tests + "" + SIMULATOR flow + ABS_TOL ${abs_tol} + REL_TOL ${rel_tol} + DIR spe1_precsalt +) + +add_test_compareECLFiles(CASENAME gasoil_precsalt + FILENAME GASCONDENSATE_VAPWAT_PRECSALT_REGRESSION SIMULATOR flow ABS_TOL ${abs_tol} REL_TOL ${rel_tol} - DIR spe1_precsalt) + DIR spe1_precsalt + TEST_ARGS --solver-max-time-step-in-days=0.05) add_test_compareECLFiles(CASENAME network_balance_01 FILENAME NETWORK-01 @@ -143,28 +165,6 @@ add_test_compareECLFiles(CASENAME network_01_reroute_std DIR network TEST_ARGS --enable-tuning=true --local-well-solve-control-switching=true) -add_test_compareECLFiles(CASENAME gas_precsalt - FILENAME GASWATER_VAPWAT_PRECSALT - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR spe1_precsalt) - -add_test_compareECLFiles(CASENAME gasoil_precsalt - FILENAME GASCONDENSATE_VAPWAT_PRECSALT_REGRESSION - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR spe1_precsalt - TEST_ARGS --solver-max-time-step-in-days=0.05) - -add_test_compareECLFiles(CASENAME spe1_brine_gaswater - FILENAME SPE1CASE2_BRINE_GASWATER - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR spe1_brine) - add_test_compareECLFiles(CASENAME spe1_metric_vfp1 FILENAME SPE1CASE1_METRIC_VFP1 SIMULATOR flow