From 98fad31a48aa034bd32ca4a442e3c6e1d02b2dc4 Mon Sep 17 00:00:00 2001 From: Timo Koch <timo.koch@iws.uni-stuttgart.de> Date: Sat, 16 Jan 2021 14:43:33 +0100 Subject: [PATCH] [test][richardsnc] Dissolve implicit folder --- .../richardsnc/CMakeLists.txt | 22 ++++++++++++++++++- .../richardsnc/implicit/CMakeLists.txt | 21 ------------------ .../richardsnc/{implicit => }/main.cc | 0 .../richardsnc/{implicit => }/params.input | 0 .../richardsnc/{implicit => }/problem.hh | 0 .../{implicit => }/spatialparams.hh | 0 6 files changed, 21 insertions(+), 22 deletions(-) delete mode 100644 test/porousmediumflow/richardsnc/implicit/CMakeLists.txt rename test/porousmediumflow/richardsnc/{implicit => }/main.cc (100%) rename test/porousmediumflow/richardsnc/{implicit => }/params.input (100%) rename test/porousmediumflow/richardsnc/{implicit => }/problem.hh (100%) rename test/porousmediumflow/richardsnc/{implicit => }/spatialparams.hh (100%) diff --git a/test/porousmediumflow/richardsnc/CMakeLists.txt b/test/porousmediumflow/richardsnc/CMakeLists.txt index 52318c8c08..b3762f2a14 100644 --- a/test/porousmediumflow/richardsnc/CMakeLists.txt +++ b/test/porousmediumflow/richardsnc/CMakeLists.txt @@ -1 +1,21 @@ -add_subdirectory(implicit) +add_input_file_links(FILES params.input) + +dumux_add_test(NAME test_richardsnc_box + LABELS porousmediumflow richardsnc + SOURCES main.cc + COMPILE_DEFINITIONS TYPETAG=RichardsWellTracerBox + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy + --files ${CMAKE_SOURCE_DIR}/test/references/test_richardsnc_box-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_box-00035.vtu + --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_box params.input -Problem.Name test_richardsnc_box") + +dumux_add_test(NAME test_richardsnc_tpfa + LABELS porousmediumflow richardsnc + SOURCES main.cc + COMPILE_DEFINITIONS TYPETAG=RichardsWellTracerCC + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy + --files ${CMAKE_SOURCE_DIR}/test/references/test_richardsnc_tpfa-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_tpfa-00033.vtu + --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_tpfa params.input -Problem.Name test_richardsnc_tpfa") diff --git a/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt b/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt deleted file mode 100644 index b3762f2a14..0000000000 --- a/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -add_input_file_links(FILES params.input) - -dumux_add_test(NAME test_richardsnc_box - LABELS porousmediumflow richardsnc - SOURCES main.cc - COMPILE_DEFINITIONS TYPETAG=RichardsWellTracerBox - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy - --files ${CMAKE_SOURCE_DIR}/test/references/test_richardsnc_box-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_box-00035.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_box params.input -Problem.Name test_richardsnc_box") - -dumux_add_test(NAME test_richardsnc_tpfa - LABELS porousmediumflow richardsnc - SOURCES main.cc - COMPILE_DEFINITIONS TYPETAG=RichardsWellTracerCC - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy - --files ${CMAKE_SOURCE_DIR}/test/references/test_richardsnc_tpfa-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_tpfa-00033.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_tpfa params.input -Problem.Name test_richardsnc_tpfa") diff --git a/test/porousmediumflow/richardsnc/implicit/main.cc b/test/porousmediumflow/richardsnc/main.cc similarity index 100% rename from test/porousmediumflow/richardsnc/implicit/main.cc rename to test/porousmediumflow/richardsnc/main.cc diff --git a/test/porousmediumflow/richardsnc/implicit/params.input b/test/porousmediumflow/richardsnc/params.input similarity index 100% rename from test/porousmediumflow/richardsnc/implicit/params.input rename to test/porousmediumflow/richardsnc/params.input diff --git a/test/porousmediumflow/richardsnc/implicit/problem.hh b/test/porousmediumflow/richardsnc/problem.hh similarity index 100% rename from test/porousmediumflow/richardsnc/implicit/problem.hh rename to test/porousmediumflow/richardsnc/problem.hh diff --git a/test/porousmediumflow/richardsnc/implicit/spatialparams.hh b/test/porousmediumflow/richardsnc/spatialparams.hh similarity index 100% rename from test/porousmediumflow/richardsnc/implicit/spatialparams.hh rename to test/porousmediumflow/richardsnc/spatialparams.hh -- GitLab