From ca4beb4be5a7bc7dd9442f9c818dfd7845b5e805 Mon Sep 17 00:00:00 2001 From: Lisa Julia Nebel Date: Tue, 7 Jan 2025 17:15:02 +0100 Subject: [PATCH 1/2] Add tests for GEFAC for ACTIONX and PYACTON --- pyactionComparisons.cmake | 42 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/pyactionComparisons.cmake b/pyactionComparisons.cmake index 555425d3a..32987d2ce 100644 --- a/pyactionComparisons.cmake +++ b/pyactionComparisons.cmake @@ -25,6 +25,26 @@ add_test_compareSeparateECLFiles(CASENAME pyaction_gconsump_insert_kw REL_TOL ${rel_tol} IGNORE_EXTRA_KW BOTH) +add_test_compareSeparateECLFiles(CASENAME actionx_gefac + DIR1 model4 + FILENAME1 MOD4_GRP_GEFAC + DIR2 actionx + FILENAME2 ACTIONX_GEFAC + SIMULATOR flow + ABS_TOL ${abs_tol} + REL_TOL ${rel_tol} + IGNORE_EXTRA_KW BOTH) + +add_test_compareSeparateECLFiles(CASENAME pyaction_gefac_insert_kw + DIR1 pyaction + FILENAME1 PYACTION_GEFAC_INSERT_KW + DIR2 actionx + FILENAME2 ACTIONX_GEFAC + SIMULATOR flow + ABS_TOL ${abs_tol} + REL_TOL ${rel_tol} + IGNORE_EXTRA_KW BOTH) + add_test_compareSeparateECLFiles(CASENAME pyaction_gruptree_insert_kw DIR1 pyaction FILENAME1 PYACTION_GRUPTREE_INSERT_KW @@ -167,6 +187,28 @@ if(MPI_FOUND) IGNORE_EXTRA_KW BOTH MPI_PROCS 4) + add_test_compareSeparateECLFiles(CASENAME actionx_gefac_4_procs + DIR1 model4 + FILENAME1 MOD4_GRP_GEFAC + DIR2 actionx + FILENAME2 ACTIONX_GEFAC + SIMULATOR flow + ABS_TOL ${abs_tol} + REL_TOL ${rel_tol} + IGNORE_EXTRA_KW BOTH + MPI_PROCS 4) + + add_test_compareSeparateECLFiles(CASENAME pyaction_gefac_insert_kw_4_procs + DIR1 pyaction + FILENAME1 PYACTION_GEFAC_INSERT_KW + DIR2 actionx + FILENAME2 ACTIONX_GEFAC + SIMULATOR flow + ABS_TOL ${abs_tol} + REL_TOL ${rel_tol} + IGNORE_EXTRA_KW BOTH + MPI_PROCS 4) + add_test_compareSeparateECLFiles(CASENAME pyaction_multx+_insert_kw_4_procs DIR1 pyaction FILENAME1 PYACTION_MULTX+_INSERT_KW From 424c3276099fbc7d7ac5847ed9214036d1120caa Mon Sep 17 00:00:00 2001 From: Lisa Julia Nebel Date: Tue, 7 Jan 2025 17:16:45 +0100 Subject: [PATCH 2/2] Rename file pyactionComparisons.cmake to pyactionActionXComparisons.cmake --- compareECLFiles.cmake | 2 +- pyactionComparisons.cmake => pyactionActionXComparisons.cmake | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pyactionComparisons.cmake => pyactionActionXComparisons.cmake (100%) diff --git a/compareECLFiles.cmake b/compareECLFiles.cmake index 368b3ab8f..ec4914b9d 100644 --- a/compareECLFiles.cmake +++ b/compareECLFiles.cmake @@ -423,7 +423,7 @@ add_test_runSimulator(CASENAME tuning_tsinit_nextstep POST_COMMAND $) if (opm-common_EMBEDDED_PYTHON) - include (${CMAKE_CURRENT_SOURCE_DIR}/pyactionComparisons.cmake) + include (${CMAKE_CURRENT_SOURCE_DIR}/pyactionActionXComparisons.cmake) endif () include (${CMAKE_CURRENT_SOURCE_DIR}/regressionTests.cmake) include (${CMAKE_CURRENT_SOURCE_DIR}/restartTests.cmake) diff --git a/pyactionComparisons.cmake b/pyactionActionXComparisons.cmake similarity index 100% rename from pyactionComparisons.cmake rename to pyactionActionXComparisons.cmake