diff --git a/compareECLFiles.cmake b/compareECLFiles.cmake index 4e58285e61..279e456d22 100644 --- a/compareECLFiles.cmake +++ b/compareECLFiles.cmake @@ -525,40 +525,70 @@ 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 - DEV_SIMULATOR flow_blackoil - 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 diff --git a/regressionTests.cmake b/regressionTests.cmake index 5586df0ac3..fc0c1dc006 100644 --- a/regressionTests.cmake +++ b/regressionTests.cmake @@ -6,103 +6,308 @@ set(abs_tol 2e-2) set(rel_tol 1e-5) set(coarse_rel_tol 1e-2) -add_test_compareECLFiles(CASENAME spe1flowexp - FILENAME SPE1CASE2 - SIMULATOR flowexp_blackoil - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR spe1) +add_test_compareECLFiles( + CASENAME + spe1flowexp + FILENAME + SPE1CASE2 + SIMULATOR + flowexp_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + spe1 +) -add_test_compareECLFiles(CASENAME 1dcompositional - FILENAME 1D_COMP - SIMULATOR flowexp_comp - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR compositional) +add_test_compareECLFiles( + CASENAME + 1dcompositional + FILENAME + 1D_COMP + SIMULATOR + flowexp_comp + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + compositional +) -add_test_compareECLFiles(CASENAME spe12 - FILENAME SPE1CASE2 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${coarse_rel_tol} - RESTART_SCHED false - RESTART_STEP 60 - DIR spe1) +add_test_compareECLFiles( + CASENAME + spe12 + FILENAME + SPE1CASE2 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${coarse_rel_tol} + RESTART_SCHED + false + RESTART_STEP + 60 + DIR + spe1 +) + +add_test_compareECLFiles( + CASENAME + spe1case1_water + FILENAME + SPE1CASE1_WATER + SIMULATOR + flow + DEV_SIMULATOR + flow_onephase + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + spe1 +) + +add_test_compareECLFiles( + CASENAME + spe1case2_thermal_onephase + FILENAME + SPE1CASE2_THERMAL_ONEPHASE + SIMULATOR + flow + DEV_SIMULATOR + flow_onephase_energy + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + spe1 +) + +add_test_compareECLFiles( + CASENAME + spe1case2_temp + FILENAME + SPE1CASE2_TEMP + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil_temp + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + spe1 +) + +add_test_compareECLFiles( + CASENAME + spe1case2_2p + FILENAME + SPE1CASE2_2P + SIMULATOR + flow + DEV_SIMULATOR + flow_oilwater + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + spe1 +) + +set(_spe1_tests_energy + SPE1CASE2_THERMAL + SPE1CASE2_THERMAL_WATVISC +) + +add_multiple_tests( + _spe1_tests_energy + "" + SIMULATOR + flow + DEV_SIMULATOR + flow_energy + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + spe1 +) set(_spe1_tests SPE1CASE1 SPE1CASE1_IMPORT - SPE1CASE1_WATER SPE1CASE2_KRNUM SPE1CASE2_NOWELLS SPE1CASE2_ROCK2DTR - SPE1CASE2_THERMAL - SPE1CASE2_THERMAL_ONEPHASE - SPE1CASE2_THERMAL_WATVISC - SPE1CASE2_2P - SPE1CASE2_TEMP ) add_multiple_tests( _spe1_tests "" - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR spe1 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + spe1 ) -set(_spe1_coarse_tests +add_test_compareECLFiles( + CASENAME + spe1case2_oilgas + FILENAME + SPE1CASE2_OILGAS + SIMULATOR + flow + DEV_SIMULATOR + flow_gasoil + ABS_TOL + ${abs_tol} + REL_TOL + ${coarse_rel_tol} + DIR + spe1 +) + +set(_spe1_coarse_tests_gw SPE1CASE2_GASWATER SPE1CASE2_GASWATER_MSW - SPE1CASE2_OILGAS ) add_multiple_tests( - _spe1_coarse_tests + _spe1_coarse_tests_gw "" - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${coarse_rel_tol} - DIR spe1 + SIMULATOR + flow + DEV_SIMULATOR + flow_gaswater + ABS_TOL + ${abs_tol} + REL_TOL + ${coarse_rel_tol} + DIR + spe1 ) -set(_spe1_brine_tests - SPE1CASE1_BRINE - SPE1CASE2_BRINE_GASWATER - SPE1CASE1_BRINE_THERMAL +add_test_compareECLFiles( + CASENAME + spe1case1_brine + FILENAME + SPE1CASE1_BRINE + SIMULATOR + flow + DEV_SIMULATOR + flow_brine + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + spe1_brine ) -add_multiple_tests( - _spe1_brine_tests - "" - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR spe1_brine +add_test_compareECLFiles( + CASENAME + spe1case2_brine_gaswater + FILENAME + SPE1CASE2_BRINE_GASWATER + SIMULATOR + flow + DEV_SIMULATOR + flow_gaswater_brine + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + spe1_brine ) -set(_spe1_precsalt_tests - GASWATER_VAPWAT_PRECSALT - SPE1CASE1_PRECSALT +add_test_compareECLFiles( + CASENAME + spe1case1_brine_thermal + FILENAME + SPE1CASE1_BRINE_THERMAL + SIMULATOR + flow + DEV_SIMULATOR + flow_brine_energy + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + spe1_brine ) -add_multiple_tests( - _spe1_precsalt_tests - "" - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR spe1_precsalt +add_test_compareECLFiles( + CASENAME + spe1case1_precsalt + FILENAME + SPE1CASE1_PRECSALT + SIMULATOR + flow + DEV_SIMULATOR + flow_brine_saltprecipitation + 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 + gaswater_vapwat_precsalt + FILENAME + GASWATER_VAPWAT_PRECSALT + SIMULATOR + flow + DEV_SIMULATOR + flow_gaswater_saltprec_vapwat + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + spe1_precsalt +) + +add_test_compareECLFiles( + CASENAME + gasoil_precsalt + FILENAME + GASCONDENSATE_VAPWAT_PRECSALT_REGRESSION + SIMULATOR + flow + DEV_SIMULATOR + flow_brine_precsalt_vapwat + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + spe1_precsalt + TEST_ARGS + --solver-max-time-step-in-days=0.05 +) set(_network_tuning_tests NETWORK-01 @@ -112,11 +317,18 @@ set(_network_tuning_tests add_multiple_tests( _network_tuning_tests "" - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR network - TEST_ARGS --enable-tuning=true + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + network + TEST_ARGS + --enable-tuning=true ) set(_network_tuning_local_switch_tests @@ -127,309 +339,742 @@ set(_network_tuning_local_switch_tests add_multiple_tests( _network_tuning_local_switch_tests "" - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR network - TEST_ARGS --enable-tuning=true --local-well-solve-control-switching=true + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + network + TEST_ARGS + --enable-tuning=true + --local-well-solve-control-switching=true ) -add_test_compareECLFiles(CASENAME network_01_wtest - FILENAME NETWORK-01-WTEST - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR network - TEST_ARGS --enable-tuning=true) +add_test_compareECLFiles( + CASENAME + network_01_wtest + FILENAME + NETWORK-01-WTEST + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + network + TEST_ARGS + --enable-tuning=true +) -add_test_compareECLFiles(CASENAME spe1_metric_vfp1 - FILENAME SPE1CASE1_METRIC_VFP1 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR vfpprod_spe1) +add_test_compareECLFiles( + CASENAME + spe1_metric_vfp1 + FILENAME + SPE1CASE1_METRIC_VFP1 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + vfpprod_spe1 +) -add_test_compareECLFiles(CASENAME spe1_spider - FILENAME SPIDER_CAKESLICE - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR radial_grid) +add_test_compareECLFiles( + CASENAME + spe1_spider + FILENAME + SPIDER_CAKESLICE + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + radial_grid +) -add_test_compareECLFiles(CASENAME spe1_radial - FILENAME RADIAL_CAKESLICE - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR radial_grid) +add_test_compareECLFiles( + CASENAME + spe1_radial + FILENAME + RADIAL_CAKESLICE + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + radial_grid +) -add_test_compareECLFiles(CASENAME jfunc_01 - FILENAME JFUNC-01 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR jfunc - TEST_ARGS --enable-tuning=true) +add_test_compareECLFiles( + CASENAME + jfunc_01 + FILENAME + JFUNC-01 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + jfunc + TEST_ARGS + --enable-tuning=true +) -add_test_compareECLFiles(CASENAME ctaquifer_2d_oilwater - FILENAME 2D_OW_CTAQUIFER - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR aquifer-oilwater) +add_test_compareECLFiles( + CASENAME + ctaquifer_2d_oilwater + FILENAME + 2D_OW_CTAQUIFER + SIMULATOR + flow + DEV_SIMULATOR + flow_oilwater + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + aquifer-oilwater +) -add_test_compareECLFiles(CASENAME fetkovich_2d - FILENAME 2D_FETKOVICHAQUIFER - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR aquifer-fetkovich) +add_test_compareECLFiles( + CASENAME + fetkovich_2d + FILENAME + 2D_FETKOVICHAQUIFER + SIMULATOR + flow + DEV_SIMULATOR + flow_oilwater + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + aquifer-fetkovich +) -add_test_compareECLFiles(CASENAME numerical_aquifer_3d_2aqu - FILENAME 3D_2AQU_NUM - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR aquifer-num - TEST_ARGS --tolerance-cnv=0.00003 --time-step-control=pid --linear-solver=cpr_trueimpes) +add_test_compareECLFiles( + CASENAME + numerical_aquifer_3d_2aqu + FILENAME + 3D_2AQU_NUM + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + aquifer-num + TEST_ARGS + --tolerance-cnv=0.00003 + --time-step-control=pid + --linear-solver=cpr_trueimpes +) -add_test_compareECLFiles(CASENAME numerical_aquifer_3d_1aqu - FILENAME 3D_1AQU_3CELLS - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR aquifer-num - TEST_ARGS --tolerance-cnv=0.00003 --time-step-control=pid --linear-solver=cpr_trueimpes) +add_test_compareECLFiles( + CASENAME + numerical_aquifer_3d_1aqu + FILENAME + 3D_1AQU_3CELLS + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + aquifer-num + TEST_ARGS + --tolerance-cnv=0.00003 + --time-step-control=pid + --linear-solver=cpr_trueimpes +) -add_test_compareECLFiles(CASENAME aquflux_01 - FILENAME AQUFLUX-01 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR aquifers - TEST_ARGS --enable-tuning=true --relaxed-max-pv-fraction=0) +add_test_compareECLFiles( + CASENAME + aquflux_01 + FILENAME + AQUFLUX-01 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + aquifers + TEST_ARGS + --enable-tuning=true + --relaxed-max-pv-fraction=0 +) -add_test_compareECLFiles(CASENAME aquflux_02 - FILENAME AQUFLUX-02 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR aquifers - TEST_ARGS --solver-max-time-step-in-days=1) +add_test_compareECLFiles( + CASENAME + aquflux_02 + FILENAME + AQUFLUX-02 + SIMULATOR + flow + DEV_SIMULATOR + flow_oilwater + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + aquifers + TEST_ARGS + --solver-max-time-step-in-days=1 +) -add_test_compareECLFiles(CASENAME spe3 - FILENAME SPE3CASE1 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${coarse_rel_tol} - TEST_ARGS --tolerance-wells=1e-6) +add_test_compareECLFiles( + CASENAME + spe3 + FILENAME + SPE3CASE1 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${coarse_rel_tol} + TEST_ARGS + --tolerance-wells=1e-6 +) -add_test_compareECLFiles(CASENAME spe9 - FILENAME SPE9_CP_SHORT - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - RESTART_STEP 10) +add_test_compareECLFiles( + CASENAME + spe9 + FILENAME + SPE9_CP_SHORT + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + RESTART_STEP + 10 +) -add_test_compareECLFiles(CASENAME spe9group - FILENAME SPE9_CP_GROUP - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol}) +add_test_compareECLFiles( + CASENAME + spe9group + FILENAME + SPE9_CP_GROUP + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} +) -add_test_compareECLFiles(CASENAME spe9group_resv - FILENAME SPE9_CP_GROUP_RESV - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR spe9group) +add_test_compareECLFiles( + CASENAME + spe9group_resv + FILENAME + SPE9_CP_GROUP_RESV + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + spe9group +) -add_test_compareECLFiles(CASENAME msw_2d_h - FILENAME 2D_H__ - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${coarse_rel_tol}) +add_test_compareECLFiles( + CASENAME + msw_2d_h + FILENAME + 2D_H__ + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${coarse_rel_tol} +) -add_test_compareECLFiles(CASENAME msw_3d_hfa - FILENAME 3D_MSW - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - TEST_ARGS --tolerance-pressure-ms-wells=10) +add_test_compareECLFiles( + CASENAME + msw_3d_hfa + FILENAME + 3D_MSW + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + TEST_ARGS + --tolerance-pressure-ms-wells=10 +) -add_test_compareECLFiles(CASENAME polymer_oilwater - FILENAME 2D_OILWATER_POLYMER - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - TEST_ARGS --solver-max-time-step-in-days=10) +add_test_compareECLFiles( + CASENAME + polymer_oilwater + FILENAME + 2D_OILWATER_POLYMER + SIMULATOR + flow + DEV_SIMULATOR + flow_oilwater_polymer + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + TEST_ARGS + --solver-max-time-step-in-days=10 +) -add_test_compareECLFiles(CASENAME polymer_injectivity - FILENAME 2D_POLYMER_INJECTIVITY - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - TEST_ARGS --tolerance-wells=1.e-6) +add_test_compareECLFiles( + CASENAME + polymer_injectivity + FILENAME + 2D_POLYMER_INJECTIVITY + SIMULATOR + flow + DEV_SIMULATOR + flow_oilwater_polymer_injectivity + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + TEST_ARGS + --tolerance-wells=1.e-6 +) -add_test_compareECLFiles(CASENAME polymer_simple2D - FILENAME 2D_THREEPHASE_POLY_HETER - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${coarse_rel_tol} - TEST_ARGS --tolerance-mb-relaxed=1.e-7) +add_test_compareECLFiles( + CASENAME + polymer_simple2D + FILENAME + 2D_THREEPHASE_POLY_HETER + SIMULATOR + flow + DEV_SIMULATOR + flow_polymer + ABS_TOL + ${abs_tol} + REL_TOL + ${coarse_rel_tol} + TEST_ARGS + --tolerance-mb-relaxed=1.e-7 +) -add_test_compareECLFiles(CASENAME spe5 - FILENAME SPE5CASE1 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${coarse_rel_tol}) +add_test_compareECLFiles( + CASENAME + spe5 + FILENAME + SPE5CASE1 + SIMULATOR + flow + DEV_SIMULATOR + flow_solvent + ABS_TOL + ${abs_tol} + REL_TOL + ${coarse_rel_tol} +) -add_test_compareECLFiles(CASENAME spe5_co2eor - FILENAME SPE5CASE1_DYN - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${coarse_rel_tol}) +add_test_compareECLFiles( + CASENAME + spe5_co2eor + FILENAME + SPE5CASE1_DYN + SIMULATOR + flow + DEV_SIMULATOR + flow_extbo + ABS_TOL + ${abs_tol} + REL_TOL + ${coarse_rel_tol} +) -add_test_compareECLFiles(CASENAME wecon_wtest - FILENAME 3D_WECON - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${coarse_rel_tol}) +add_test_compareECLFiles( + CASENAME + wecon_wtest + FILENAME + 3D_WECON + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${coarse_rel_tol} +) -add_test_compareECLFiles(CASENAME msw_model_1 - FILENAME MSW_MODEL_1 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR model1 - TEST_ARGS --solver-max-time-step-in-days=5.0) +add_test_compareECLFiles( + CASENAME + msw_model_1 + FILENAME + MSW_MODEL_1 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + model1 + TEST_ARGS + --solver-max-time-step-in-days=5.0 +) -add_test_compareECLFiles(CASENAME base_model_1 - FILENAME BASE_MODEL_1 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR model1) +add_test_compareECLFiles( + CASENAME + base_model_1 + FILENAME + BASE_MODEL_1 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + model1 +) -add_test_compareECLFiles(CASENAME faults_model_1 - FILENAME FAULTS_MODEL_1 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR model1 - TEST_ARGS --solver-max-time-step-in-days=5.0) +add_test_compareECLFiles( + CASENAME + faults_model_1 + FILENAME + FAULTS_MODEL_1 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + model1 + TEST_ARGS + --solver-max-time-step-in-days=5.0 +) -add_test_compareECLFiles(CASENAME base_model2_welpi - FILENAME 0B_WELPI_MODEL2 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR model2 - TEST_ARGS --enable-tuning=true) +add_test_compareECLFiles( + CASENAME + base_model2_welpi + FILENAME + 0B_WELPI_MODEL2 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + model2 + TEST_ARGS + --enable-tuning=true +) -add_test_compareECLFiles(CASENAME 0a1_grpctl_msw_model2 - FILENAME 0A1_GRCTRL_LRAT_ORAT_BASE_MODEL2_MSW - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR model2 - TEST_ARGS --solver-max-time-step-in-days=3) +add_test_compareECLFiles( + CASENAME + 0a1_grpctl_msw_model2 + FILENAME + 0A1_GRCTRL_LRAT_ORAT_BASE_MODEL2_MSW + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + model2 + TEST_ARGS + --solver-max-time-step-in-days=3 +) -add_test_compareECLFiles(CASENAME 0a2_grpctl_msw_model2 - FILENAME 0A2_GRCTRL_LRAT_ORAT_GGR_BASE_MODEL2_MSW - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR model2 - TEST_ARGS --solver-max-time-step-in-days=3) +add_test_compareECLFiles( + CASENAME + 0a2_grpctl_msw_model2 + FILENAME + 0A2_GRCTRL_LRAT_ORAT_GGR_BASE_MODEL2_MSW + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + model2 + TEST_ARGS + --solver-max-time-step-in-days=3 +) -add_test_compareECLFiles(CASENAME 0a3_grpctl_msw_model2 - FILENAME 0A3_GRCTRL_LRAT_LRAT_BASE_MODEL2_MSW - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR model2 - TEST_ARGS --solver-max-time-step-in-days=3) +add_test_compareECLFiles( + CASENAME + 0a3_grpctl_msw_model2 + FILENAME + 0A3_GRCTRL_LRAT_LRAT_BASE_MODEL2_MSW + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + model2 + TEST_ARGS + --solver-max-time-step-in-days=3 +) -add_test_compareECLFiles(CASENAME 0a4_grpctl_msw_model2 - FILENAME 0A4_GRCTRL_LRAT_LRAT_GGR_BASE_MODEL2_MSW - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR model2 - TEST_ARGS --solver-max-time-step-in-days=3) +add_test_compareECLFiles( + CASENAME + 0a4_grpctl_msw_model2 + FILENAME + 0A4_GRCTRL_LRAT_LRAT_GGR_BASE_MODEL2_MSW + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + model2 + TEST_ARGS + --solver-max-time-step-in-days=3 +) -add_test_compareECLFiles(CASENAME udq_actionx - FILENAME UDQ_ACTIONX - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR udq_actionx - TEST_ARGS --solver-max-time-step-in-days=5) +add_test_compareECLFiles( + CASENAME + udq_actionx + FILENAME + UDQ_ACTIONX + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + udq_actionx + TEST_ARGS + --solver-max-time-step-in-days=5 +) -add_test_compareECLFiles(CASENAME udq_wconprod - FILENAME UDQ_WCONPROD - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR udq_actionx) +add_test_compareECLFiles( + CASENAME + udq_wconprod + FILENAME + UDQ_WCONPROD + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + udq_actionx +) -add_test_compareECLFiles(CASENAME actionx_m1 - FILENAME ACTIONX_M1 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR udq_actionx - TEST_ARGS --solver-max-time-step-in-days=0.2) +add_test_compareECLFiles( + CASENAME + actionx_m1 + FILENAME + ACTIONX_M1 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + udq_actionx + TEST_ARGS + --solver-max-time-step-in-days=0.2 +) -add_test_compareECLFiles(CASENAME waghyst1 - FILENAME WAGHYSTR-01 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR waghystr) +add_test_compareECLFiles( + CASENAME + waghyst1 + FILENAME + WAGHYSTR-01 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + waghystr +) -add_test_compareECLFiles(CASENAME waghyst2 - FILENAME WAGHYSTR-02 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR waghystr) +add_test_compareECLFiles( + CASENAME + waghyst2 + FILENAME + WAGHYSTR-02 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + waghystr +) -add_test_compareECLFiles(CASENAME gpmaint11 - FILENAME GPMAINT-11 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR gpmaint) +add_test_compareECLFiles( + CASENAME + gpmaint11 + FILENAME + GPMAINT-11 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + gpmaint +) -add_test_compareECLFiles(CASENAME 3dwecon9 - FILENAME 3D_WECON_9 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR wecon_wtest) +add_test_compareECLFiles( + CASENAME + 3dwecon9 + FILENAME + 3D_WECON_9 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + wecon_wtest +) -add_test_compareECLFiles(CASENAME gconinje_resv_gas_01 - FILENAME GCONINJE_RESV_GAS-01 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR resv_ctrl) +add_test_compareECLFiles( + CASENAME + gconinje_resv_gas_01 + FILENAME + GCONINJE_RESV_GAS-01 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + resv_ctrl +) -add_test_compareECLFiles(CASENAME gconinje_resv1 - FILENAME GCONINJE-01 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR gconinje) +add_test_compareECLFiles( + CASENAME + gconinje_resv1 + FILENAME + GCONINJE-01 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + gconinje +) -add_test_compareECLFiles(CASENAME gconinje_resv2 - FILENAME GCONINJE-02 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR gconinje) +add_test_compareECLFiles( + CASENAME + gconinje_resv2 + FILENAME + GCONINJE-02 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + gconinje +) set(_gconprod_cases T1L @@ -441,10 +1086,16 @@ set(_gconprod_cases add_multiple_tests( _gconprod_cases gconprod_ - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR gconprod + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + gconprod ) set(_pinch_cases @@ -475,10 +1126,16 @@ set(_pinch_cases add_multiple_tests( _pinch_cases pinch_ - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR pinch + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + pinch ) set(_udt_cases @@ -491,11 +1148,18 @@ set(_udt_cases add_multiple_tests( _udt_cases "" - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - TEST_ARGS --enable-tuning=true - DIR udt + SIMULATOR + flow + DEV_SIMULATOR + flow_oilwater + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + udt + TEST_ARGS + --enable-tuning=true ) add_multiple_test_range( @@ -503,10 +1167,16 @@ add_multiple_test_range( 6 EQUALREG-0 equalreg_multy - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR mult + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + mult ) add_multiple_test_range( @@ -514,10 +1184,16 @@ add_multiple_test_range( 6 ACTIONX_WELL_TEMPL-0 actionx_well_templ - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR actionx + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + actionx ) add_multiple_test_range( @@ -525,52 +1201,113 @@ add_multiple_test_range( 8 WCYCLE- WCYCLE - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR wcycle - TEST_ARGS --enable-tuning=true + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + wcycle + TEST_ARGS + --enable-tuning=true ) -add_test_compareECLFiles(CASENAME udq_uadd - FILENAME UDQ_M1 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR udq_actionx - TEST_ARGS --tolerance-wells=1.e-8) +add_test_compareECLFiles( + CASENAME + udq_uadd + FILENAME + UDQ_M1 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + udq_actionx + TEST_ARGS + --tolerance-wells=1.e-8 +) -add_test_compareECLFiles(CASENAME udq_undefined - FILENAME UDQ_M2 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR udq_actionx) +add_test_compareECLFiles( + CASENAME + udq_undefined + FILENAME + UDQ_M2 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + udq_actionx +) -add_test_compareECLFiles(CASENAME udq_in_actionx - FILENAME UDQ_M3 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR udq_actionx) +add_test_compareECLFiles( + CASENAME + udq_in_actionx + FILENAME + UDQ_M3 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + udq_actionx +) -add_test_compareECLFiles(CASENAME reg_smry_in_fld_udq - FILENAME UDQ_REG-01 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR udq_actionx - TEST_ARGS --enable-tuning=true --time-step-control=pid) +add_test_compareECLFiles( + CASENAME + reg_smry_in_fld_udq + FILENAME + UDQ_REG-01 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + udq_actionx + TEST_ARGS + --enable-tuning=true + --time-step-control=pid +) # UDQ ASSIGN for subsets of group level UDQs. Updates triggered from # ACTIONX blocks. -add_test_compareECLFiles(CASENAME group_udq - FILENAME UDQ_GRP-01 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR udq_actionx - TEST_ARGS --solver-max-time-step-in-days=0.25) +add_test_compareECLFiles( + CASENAME + group_udq + FILENAME + UDQ_GRP-01 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + udq_actionx + TEST_ARGS + --solver-max-time-step-in-days=0.25 +) set(_actionx_tests ACTIONX_GCONINJE @@ -585,10 +1322,16 @@ set(_actionx_tests add_multiple_tests( _actionx_tests "" - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR actionx + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + actionx ) add_multiple_test_range( @@ -596,47 +1339,202 @@ add_multiple_test_range( 5 CSKIN-0 cskin - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR cskin + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + cskin ) -set(_co2store_cases +set(_co2store_gasoil_cases CO2STORE - CO2STORE_DIFFUSIVE CO2STORE_DRSDTCON - CO2STORE_ENERGY - CO2STORE_GASWAT +) + +add_multiple_tests( + _co2store_gasoil_cases + "" + SIMULATOR + flow + DEV_SIMULATOR + flow_gasoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + co2store +) + +set(_co2store_gaswater_d_cases CO2STORE_GW CO2STORE_GW_DIRICHLET ) add_multiple_tests( - _co2store_cases + _co2store_gaswater_d_cases "" - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR co2store + SIMULATOR + flow + DEV_SIMULATOR + flow_gaswater_dissolution + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + co2store ) -set(_h2store_cases - H2STORE - H2STORE_DIFFUSIVE - H2STORE_ENERGY - H2STORE_GASWAT - H2STORE_GW +add_test_compareECLFiles( + CASENAME + co2store_gaswat + FILENAME + CO2STORE_GASWAT + SIMULATOR + flow + DEV_SIMULATOR + flow_gaswater + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + co2store ) -add_multiple_tests( - _h2store_cases - "" - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR h2store - TEST_ARGS --tolerance-cnv-relaxed=0.01 +add_test_compareECLFiles( + CASENAME + co2store_energy + FILENAME + CO2STORE_ENERGY + SIMULATOR + flow + DEV_SIMULATOR + flow_gasoil_energy + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + co2store +) + +add_test_compareECLFiles( + CASENAME + co2store_diffusive + FILENAME + CO2STORE_DIFFUSIVE + SIMULATOR + flow + DEV_SIMULATOR + flow_gasoildiffuse + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + co2store +) + +add_test_compareECLFiles( + CASENAME + h2store + FILENAME + H2STORE + SIMULATOR + flow + DEV_SIMULATOR + flow_gasoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + h2store + TEST_ARGS + --tolerance-cnv-relaxed=0.01 +) + +add_test_compareECLFiles( + CASENAME + h2store_gaswat + FILENAME + H2STORE_GASWAT + SIMULATOR + flow + DEV_SIMULATOR + flow_gaswater + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + h2store + TEST_ARGS + --tolerance-cnv-relaxed=0.01 +) + +add_test_compareECLFiles( + CASENAME + h2store_gw + FILENAME + H2STORE_GW + SIMULATOR + flow + DEV_SIMULATOR + flow_gaswater_dissolution + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + h2store + TEST_ARGS + --tolerance-cnv-relaxed=0.01 +) + +add_test_compareECLFiles( + CASENAME + h2store_diffusive + FILENAME + H2STORE_DIFFUSIVE + SIMULATOR + flow + DEV_SIMULATOR + flow_gasoildiffuse + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + h2store + TEST_ARGS + --tolerance-cnv-relaxed=0.01 +) + +add_test_compareECLFiles( + CASENAME + h2store_energy + FILENAME + H2STORE_ENERGY + SIMULATOR + flow + DEV_SIMULATOR + flow_gasoil_energy + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + h2store + TEST_ARGS + --tolerance-cnv-relaxed=0.01 ) set(_tpsa_cases @@ -647,31 +1545,64 @@ set(_tpsa_cases add_multiple_tests( _tpsa_cases "" - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR tpsa - TEST_ARGS --enable-opm-rst-file=1 + SIMULATOR + flow + DEV_SIMULATOR + flow_onephase_tpsa + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + tpsa + TEST_ARGS + --enable-opm-rst-file=1 ) -add_test_compareECLFiles(CASENAME ppcwmax - FILENAME PPCWMAX-01 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR ppcwmax) +add_test_compareECLFiles( + CASENAME + ppcwmax + FILENAME + PPCWMAX-01 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + ppcwmax +) get_property(opm-common_EMBEDDED_PYTHON TARGET opmcommon PROPERTY EMBEDDED_PYTHON) if(opm-common_EMBEDDED_PYTHON) - add_test_compareECLFiles(CASENAME udq_pyaction - FILENAME PYACTION_WCONPROD - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR udq_actionx - TEST_ARGS --solver-max-time-step-in-days=10) + add_test_compareECLFiles( + CASENAME + udq_pyaction + FILENAME + PYACTION_WCONPROD + DEV_SIMULATOR + flow_blackoil + SIMULATOR + flow + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + udq_actionx + TEST_ARGS + --solver-max-time-step-in-days=10 + ) if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.22) - set_tests_properties(compareECLFiles_flow+PYACTION_WCONPROD PROPERTIES + if(USE_DEV_SIMULATOR_IN_TESTS) + set(test_name compareECLFiles_flow_blackoil+PYACTION_WCONPROD) + else() + set(test_name compareECLFiles_flow+PYACTION_WCONPROD) + endif() + set_tests_properties(${test_name} PROPERTIES ENVIRONMENT_MODIFICATION PYTHONPATH=path_list_append:${opm-common_DIR}/python) endif() endif() @@ -722,332 +1653,772 @@ set(_model2_tests add_multiple_tests( _model2_tests "" - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR model2 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + model2 ) -add_test_compareECLFiles(CASENAME multflt_model2 - FILENAME 3_MULTFLT_MODEL2 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR model2 - TEST_ARGS --solver-max-time-step-in-days=10) +add_test_compareECLFiles( + CASENAME + multflt_model2 + FILENAME + 3_MULTFLT_MODEL2 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + model2 + TEST_ARGS + --solver-max-time-step-in-days=10 +) -add_test_compareECLFiles(CASENAME multpvv_model2 - FILENAME 4_MINPVV_MODEL2 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR model2 - TEST_ARGS --solver-max-time-step-in-days=10) +add_test_compareECLFiles( + CASENAME + multpvv_model2 + FILENAME + 4_MINPVV_MODEL2 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + model2 + TEST_ARGS + --solver-max-time-step-in-days=10 +) -add_test_compareECLFiles(CASENAME 9_3d_grpctl_stw_model2 - FILENAME 9_3D_GINJ_GAS_MAX_EXPORT_STW - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR model2 - TEST_ARGS --time-step-after-event-in-days=1) +add_test_compareECLFiles( + CASENAME + 9_3d_grpctl_stw_model2 + FILENAME + 9_3D_GINJ_GAS_MAX_EXPORT_STW + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + model2 + TEST_ARGS + --time-step-after-event-in-days=1 +) -add_test_compareECLFiles(CASENAME model4_udq_group - FILENAME MOD4_UDQ_ACTIONX - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR model4) +add_test_compareECLFiles( + CASENAME + model4_udq_group + FILENAME + MOD4_UDQ_ACTIONX + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + model4 +) -add_test_compareECLFiles(CASENAME model4_gefac - FILENAME MOD4_GRP_GEFAC - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR model4) +add_test_compareECLFiles( + CASENAME + model4_gefac + FILENAME + MOD4_GRP_GEFAC + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + model4 +) -add_test_compareECLFiles(CASENAME model6_msw - FILENAME 1_MSW_MODEL6 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR model6) +add_test_compareECLFiles( + CASENAME + model6_msw + FILENAME + 1_MSW_MODEL6 + SIMULATOR + flow + DEV_SIMULATOR + flow_oilwater + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + model6 +) -add_test_compareECLFiles(CASENAME wsegsicd - FILENAME TEST_WSEGSICD - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol}) +add_test_compareECLFiles( + CASENAME + wsegsicd + FILENAME + TEST_WSEGSICD + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} +) -add_test_compareECLFiles(CASENAME wsegaicd - FILENAME BASE_MSW_WSEGAICD - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol}) +add_test_compareECLFiles( + CASENAME + wsegaicd + FILENAME + BASE_MSW_WSEGAICD + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} +) -add_test_compareECLFiles(CASENAME wsegvalv - FILENAME BASE_MSW_WSEGVALV - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol}) +add_test_compareECLFiles( + CASENAME + wsegvalv + FILENAME + BASE_MSW_WSEGVALV + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} +) -add_test_compareECLFiles(CASENAME wsegvalv_2d_vert - FILENAME MSW-2D-VERT-02 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR msw) +add_test_compareECLFiles( + CASENAME + wsegvalv_2d_vert + FILENAME + MSW-2D-VERT-02 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + msw +) -add_test_compareECLFiles(CASENAME nnc - FILENAME NNC_AND_EDITNNC - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR editnnc - TEST_ARGS --enable-opm-rst-file=1) +add_test_compareECLFiles( + CASENAME + nnc + FILENAME + NNC_AND_EDITNNC + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + editnnc + TEST_ARGS + --enable-opm-rst-file=1 +) -add_test_compareECLFiles(CASENAME nonnc - FILENAME NONNC - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR editnnc) +add_test_compareECLFiles( + CASENAME + nonnc + FILENAME + NONNC + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + editnnc +) -add_test_compareECLFiles(CASENAME nnc_overlapping_editnnc - FILENAME NNC_OVERLAPPING_EDITNNC - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR editnnc - TEST_ARGS --enable-opm-rst-file=1) +add_test_compareECLFiles( + CASENAME + nnc_overlapping_editnnc + FILENAME + NNC_OVERLAPPING_EDITNNC + SIMULATOR + flow + DEV_SIMULATOR + flow_gaswater + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + editnnc + TEST_ARGS + --enable-opm-rst-file=1 +) -add_test_compareECLFiles(CASENAME nnc_overlapping_editnncr_multregt - FILENAME NNC_OVERLAPPING_EDITNNCR_MULTREGT - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR editnnc - TEST_ARGS --enable-opm-rst-file=1) +add_test_compareECLFiles( + CASENAME + nnc_overlapping_editnncr_multregt + FILENAME + NNC_OVERLAPPING_EDITNNCR_MULTREGT + SIMULATOR + flow + DEV_SIMULATOR + flow_gaswater + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + editnnc + TEST_ARGS + --enable-opm-rst-file=1 +) -add_test_compareECLFiles(CASENAME spe1_foam - FILENAME SPE1FOAM - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR spe1_foam) +add_test_compareECLFiles( + CASENAME + spe1_foam + FILENAME + SPE1FOAM + SIMULATOR + flow + DEV_SIMULATOR + flow_foam + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + spe1_foam +) -add_test_compareECLFiles(CASENAME spe1_solvent_foam - FILENAME SPE1CASE2_SOLVENT_FOAM - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR spe1_solvent) +add_test_compareECLFiles( + CASENAME + spe1_solvent_foam + FILENAME + SPE1CASE2_SOLVENT_FOAM + SIMULATOR + flow + DEV_SIMULATOR + flow_solvent_foam + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + spe1_solvent +) -add_test_compareECLFiles(CASENAME spe1_gaswater_solvent - FILENAME SPE1CASE2_GASWATER_SOLVENT - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR spe1_solvent) +add_test_compareECLFiles( + CASENAME + spe1_gaswater_solvent + FILENAME + SPE1CASE2_GASWATER_SOLVENT + SIMULATOR + flow + DEV_SIMULATOR + flow_gaswater_solvent + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + spe1_solvent +) -add_test_compareECLFiles(CASENAME spe1_co2sol - FILENAME SPE1CASE2_CO2SOL - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR spe1_solvent - TEST_ARGS --enable-opm-rst-file=1) +add_test_compareECLFiles( + CASENAME + spe1_co2sol + FILENAME + SPE1CASE2_CO2SOL + SIMULATOR + flow + DEV_SIMULATOR + flow_solvent + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + spe1_solvent + TEST_ARGS + --enable-opm-rst-file=1 +) -add_test_compareECLFiles(CASENAME spe1_h2sol - FILENAME SPE1CASE2_H2SOL - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR spe1_solvent - TEST_ARGS --enable-opm-rst-file=1) +add_test_compareECLFiles( + CASENAME + spe1_h2sol + FILENAME + SPE1CASE2_H2SOL + SIMULATOR + flow + DEV_SIMULATOR + flow_solvent + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + spe1_solvent + TEST_ARGS + --enable-opm-rst-file=1 +) -add_test_compareECLFiles(CASENAME bc_lab - FILENAME BC_LAB - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR bc_lab) +add_test_compareECLFiles( + CASENAME + bc_lab + FILENAME + BC_LAB + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + bc_lab +) -add_test_compareECLFiles(CASENAME norne_reperf - FILENAME NORNE_ATW2013_B1H_RE-PERF - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR norne - TEST_ARGS --tolerance-wells=1.e-8) +add_test_compareECLFiles( + CASENAME + norne_reperf + FILENAME + NORNE_ATW2013_B1H_RE-PERF + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + norne + TEST_ARGS + --tolerance-wells=1.e-8 +) -add_test_compareECLFiles(CASENAME compl_smry - FILENAME COMPL_SMRY - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR compl_smry) +add_test_compareECLFiles( + CASENAME + compl_smry + FILENAME + COMPL_SMRY + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + compl_smry +) -add_test_compareECLFiles(CASENAME 3d_tran_operator - FILENAME 3D_TRAN_OPERATOR - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR parallel_fieldprops - TEST_ARGS --enable-tuning=true --relaxed-max-pv-fraction=0) +add_test_compareECLFiles( + CASENAME + 3d_tran_operator + FILENAME + 3D_TRAN_OPERATOR + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + parallel_fieldprops + TEST_ARGS + --enable-tuning=true + --relaxed-max-pv-fraction=0 +) -add_test_compareECLFiles(CASENAME h2store_biofilm - FILENAME H2STORE_BIOFILM - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR h2store - TEST_ARGS --enable-opm-rst-file=true --initial-time-step-in-days=0.01) +add_test_compareECLFiles( + CASENAME + h2store_biofilm + FILENAME + H2STORE_BIOFILM + SIMULATOR + flow + DEV_SIMULATOR + flow_biofilm + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + h2store + TEST_ARGS + --enable-opm-rst-file=true + --initial-time-step-in-days=0.01 +) -add_test_compareECLFiles(CASENAME micp - FILENAME MICP - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR micp - TEST_ARGS --enable-opm-rst-file=true) +add_test_compareECLFiles( + CASENAME + micp + FILENAME + MICP + SIMULATOR + flow + DEV_SIMULATOR + flow_micp + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + micp + TEST_ARGS + --enable-opm-rst-file=true +) -add_test_compareECLFiles(CASENAME 0_base_model6 - FILENAME 0_BASE_MODEL6 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR model6) +add_test_compareECLFiles( + CASENAME + 0_base_model6 + FILENAME + 0_BASE_MODEL6 + SIMULATOR + flow + DEV_SIMULATOR + flow_oilwater + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + model6 +) -add_test_compareECLFiles(CASENAME 0a_aquct_model6 - FILENAME 0A_AQUCT_MODEL6 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR model6) +add_test_compareECLFiles( + CASENAME + 0a_aquct_model6 + FILENAME + 0A_AQUCT_MODEL6 + SIMULATOR + flow + DEV_SIMULATOR + flow_oilwater + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + model6 +) -add_test_compareECLFiles(CASENAME 0b_rocktab_model6 - FILENAME 0B_ROCKTAB_MODEL6 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR model6) +add_test_compareECLFiles( + CASENAME + 0b_rocktab_model6 + FILENAME + 0B_ROCKTAB_MODEL6 + SIMULATOR + flow + DEV_SIMULATOR + flow_oilwater + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + model6 +) -add_test_compareECLFiles(CASENAME base_wt_tracer - FILENAME BASE_WT_TRACER - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR tracer - RESTART_STEP 1,3,7) +add_test_compareECLFiles( + CASENAME + base_wt_tracer + FILENAME + BASE_WT_TRACER + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + tracer + RESTART_STEP + 1,3,7 +) -add_test_compareECLFiles(CASENAME tracer_multiphase - FILENAME TRACER_2WT_2GT - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR tracer) +add_test_compareECLFiles( + CASENAME + tracer_multiphase + FILENAME + TRACER_2WT_2GT + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + tracer +) add_multiple_test_range( 1 3 MIN_BHP_ min_bhp - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR wtest/bhp_min - TEST_ARGS --enable-tuning=true + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + wtest/bhp_min + TEST_ARGS + --enable-tuning=true ) -add_test_compareECLFiles(CASENAME min_thp_1 - FILENAME MIN_THP_1 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR wtest/thp_min - TEST_ARGS --enable-tuning=true) +add_test_compareECLFiles( + CASENAME + min_thp_1 + FILENAME + MIN_THP_1 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + wtest/thp_min + TEST_ARGS + --enable-tuning=true +) -add_test_compareECLFiles(CASENAME max_gor_1 - FILENAME MAX_GOR_1 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR wtest/wecon_gor_max - TEST_ARGS --enable-tuning=true) +add_test_compareECLFiles( + CASENAME + max_gor_1 + FILENAME + MAX_GOR_1 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + wtest/wecon_gor_max + TEST_ARGS + --enable-tuning=true +) -add_test_compareECLFiles(CASENAME min_gasrate_1 - FILENAME MIN_GASRATE_1 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR wtest/wecon_qg_min - TEST_ARGS --enable-tuning=true) +add_test_compareECLFiles( + CASENAME + min_gasrate_1 + FILENAME + MIN_GASRATE_1 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + wtest/wecon_qg_min + TEST_ARGS + --enable-tuning=true +) -add_test_compareECLFiles(CASENAME min_qoil_1 - FILENAME MIN_QOIL_1 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR wtest/wecon_qo_min - TEST_ARGS --enable-tuning=true) +add_test_compareECLFiles( + CASENAME + min_qoil_1 + FILENAME + MIN_QOIL_1 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + wtest/wecon_qo_min + TEST_ARGS + --enable-tuning=true +) add_multiple_test_range( 1 4 MAX_WATERCUT_ max_watercut - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR wtest/wecon_wct_max - TEST_ARGS --enable-tuning=true + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + wtest/wecon_wct_max + TEST_ARGS + --enable-tuning=true ) -add_test_compareECLFiles(CASENAME max_wgr_1 - FILENAME MAX_WGR_1 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR wtest/wecon_wgr_max - TEST_ARGS --enable-tuning=true) +add_test_compareECLFiles( + CASENAME + max_wgr_1 + FILENAME + MAX_WGR_1 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + wtest/wecon_wgr_max + TEST_ARGS + --enable-tuning=true +) -add_test_compareECLFiles(CASENAME rxft_smry - FILENAME TEST_RXFT - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR rxft_smry - TEST_ARGS --enable-tuning=true --linear-solver-reduction=1e-7) +add_test_compareECLFiles( + CASENAME + rxft_smry + FILENAME + TEST_RXFT + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + rxft_smry + TEST_ARGS + --enable-tuning=true + --linear-solver-reduction=1e-7 +) -add_test_compareECLFiles(CASENAME bo_diffusion - FILENAME BO_DIFFUSE_CASE1 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR diffusion ) +add_test_compareECLFiles( + CASENAME + bo_diffusion + FILENAME + BO_DIFFUSE_CASE1 + SIMULATOR + flow + DEV_SIMULATOR + flow_gasoildiffuse + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + diffusion +) -add_test_compareECLFiles(CASENAME fpr_nonhc - FILENAME WATER2F - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR water-1ph) +add_test_compareECLFiles( + CASENAME + fpr_nonhc + FILENAME + WATER2F + SIMULATOR + flow + DEV_SIMULATOR + flow_onephase + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + water-1ph +) -add_test_compareECLFiles(CASENAME actionx_wpimult - FILENAME ACTIONX_WPIMULT - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR actionx - TEST_ARGS --enable-tuning=true) +add_test_compareECLFiles( + CASENAME + actionx_wpimult + FILENAME + ACTIONX_WPIMULT + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + actionx + TEST_ARGS + --enable-tuning=true +) -add_test_compareECLFiles(CASENAME wvfpexp_02 - FILENAME WVFPEXP-02 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR wvfpexp) +add_test_compareECLFiles( + CASENAME + wvfpexp_02 + FILENAME + WVFPEXP-02 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + wvfpexp +) set(_krnum_tests KRNUM-02X @@ -1061,10 +2432,16 @@ set(_krnum_tests add_multiple_tests( _krnum_tests "" - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR krnum + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + krnum ) set(_gridunit_tests @@ -1079,70 +2456,137 @@ set(_gridunit_tests add_multiple_tests( _gridunit_tests "" - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR gridunit + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + gridunit ) -add_test_compareECLFiles(CASENAME 01_wgrupcon - FILENAME 01-WGRUPCON - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR wgrupcon - TEST_ARGS --enable-tuning=true) +add_test_compareECLFiles( + CASENAME + 01_wgrupcon + FILENAME + 01-WGRUPCON + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + wgrupcon + TEST_ARGS + --enable-tuning=true +) -add_test_compareECLFiles(CASENAME 02_wgrupcon - FILENAME 02-WGRUPCON - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR wgrupcon - TEST_ARGS --enable-tuning=true) -add_test_compareECLFiles(CASENAME winjmult_stdw - FILENAME WINJMULT_STDW - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR winjmult - TEST_ARGS --enable-tuning=true) -add_test_compareECLFiles(CASENAME winjmult_msw - FILENAME WINJMULT_MSW - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR winjmult - TEST_ARGS --enable-tuning=true) -add_test_compareECLFiles(CASENAME winjdam_stdw - FILENAME WINJDAM_STDW - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR winjdam - TEST_ARGS --enable-tuning=true) -add_test_compareECLFiles(CASENAME winjdam_msw - FILENAME WINJDAM_MSW - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR winjdam - TEST_ARGS --enable-tuning=true) -add_test_compareECLFiles(CASENAME 01_vappars - FILENAME VAPPARS-01 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR vappars) +add_test_compareECLFiles( + CASENAME + 02_wgrupcon + FILENAME + 02-WGRUPCON + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + wgrupcon + TEST_ARGS + --enable-tuning=true +) -add_test_compareECLFiles(CASENAME 6_uda_model5_stdw - FILENAME 6_UDA_MODEL5_STDW - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR model5 - RESTART_STEP 1 - TEST_ARGS --enable-tuning=true +set(_winjmult_cases + WINJMULT_MSW + WINJMULT_STDW +) + + +add_multiple_tests( + _winjmult_cases + "" + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + winjmult + TEST_ARGS + --enable-tuning=true +) + +set(_winjdam_cases + WINJDAM_MSW + WINJDAM_STDW +) + +add_multiple_tests( + _winjdam_cases + "" + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + winjdam + TEST_ARGS + --enable-tuning=true +) + +add_test_compareECLFiles( + CASENAME + 01_vappars + FILENAME + VAPPARS-01 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + vappars +) + +add_test_compareECLFiles( + CASENAME + 6_uda_model5_stdw + FILENAME + 6_UDA_MODEL5_STDW + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + model5 + RESTART_STEP + 1 + TEST_ARGS + --enable-tuning=true ) set(_mult_cases @@ -1160,50 +2604,101 @@ set(_mult_cases add_multiple_tests( _mult_cases "" - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR mult + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + mult ) -add_test_compareECLFiles(CASENAME gsatprod - FILENAME GSATPROD2 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR satellite) +add_test_compareECLFiles( + CASENAME + gsatprod + FILENAME + GSATPROD2 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + satellite +) -add_test_compareECLFiles(CASENAME gsatprod6 - FILENAME GSATPROD6 - SIMULATOR flow - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR satellite) +add_test_compareECLFiles( + CASENAME + gsatprod6 + FILENAME + GSATPROD6 + SIMULATOR + flow + DEV_SIMULATOR + flow_blackoil + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + satellite +) if(BUILD_FLOW_POLY_GRID) - add_test_compareECLFiles(CASENAME spe12_polyhedralgrid - FILENAME SPE1CASE2 - SIMULATOR flow_blackoil_polyhedralgrid - ABS_TOL ${abs_tol} - REL_TOL ${coarse_rel_tol} - DIR spe1) + add_test_compareECLFiles( + CASENAME + spe12_polyhedralgrid + FILENAME + SPE1CASE2 + SIMULATOR + flow_blackoil_polyhedralgrid + ABS_TOL + ${abs_tol} + REL_TOL + ${coarse_rel_tol} + DIR + spe1 + ) endif() if(dune-alugrid_FOUND AND BUILD_FLOW_ALU_GRID AND MPI_FOUND) - add_test_compareECLFiles(CASENAME spe12_alugrid - FILENAME SPE1CASE2 - SIMULATOR flow_blackoil_alugrid - ABS_TOL ${abs_tol} - REL_TOL ${coarse_rel_tol} - DIR spe1) + add_test_compareECLFiles( + CASENAME + spe12_alugrid + FILENAME + SPE1CASE2 + SIMULATOR + flow_blackoil_alugrid + ABS_TOL + ${abs_tol} + REL_TOL + ${coarse_rel_tol} + DIR + spe1 + ) endif() if(BUILD_FLOW_FLOAT_VARIANTS) - add_test_compareECLFiles(CASENAME spe1_float - FILENAME SPE1CASE1 - SIMULATOR flow_blackoil_float - ABS_TOL ${abs_tol} - REL_TOL ${rel_tol} - DIR spe1 - TEST_ARGS --tolerance-mb=1e-6) + add_test_compareECLFiles( + CASENAME + spe1_float + FILENAME + SPE1CASE1 + SIMULATOR + flow_blackoil_float + ABS_TOL + ${abs_tol} + REL_TOL + ${rel_tol} + DIR + spe1 + TEST_ARGS + --tolerance-mb=1e-6 + ) endif() diff --git a/tests/run-porv-acceptanceTest.sh b/tests/run-porv-acceptanceTest.sh index 5d44ebde87..c7f726c1b7 100755 --- a/tests/run-porv-acceptanceTest.sh +++ b/tests/run-porv-acceptanceTest.sh @@ -18,11 +18,13 @@ then echo -e "\t\t -t Relative tolerance in comparison" echo -e "\t\t -c Path to comparison tool" echo -e "\t\t -e Simulator binary to use" + echo -e "\tOptional options:" + echo -e "\t\t -u 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