From a41e11c93552d29f1df3fcea79d33cef8687e9b6 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Tue, 25 Nov 2014 14:41:41 +0000
Subject: [PATCH] [cmake] remove obsolete calls of add_dune...flags
The flags are included by the add_dumux_test macro by now.
Reviewed by gruenich.
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13792 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
test/decoupled/1p/CMakeLists.txt | 2 --
test/decoupled/2p/CMakeLists.txt | 5 -----
test/decoupled/2p2c/CMakeLists.txt | 1 -
test/freeflow/navierstokes/CMakeLists.txt | 3 ---
test/freeflow/stokes/CMakeLists.txt | 1 -
test/freeflow/stokes2c/CMakeLists.txt | 1 -
test/freeflow/stokes2cni/CMakeLists.txt | 2 --
test/geomechanics/el1p2c/CMakeLists.txt | 1 -
test/geomechanics/el2p/CMakeLists.txt | 1 -
test/geomechanics/elastic/CMakeLists.txt | 1 -
test/implicit/1p/CMakeLists.txt | 2 --
test/implicit/2pdfm/CMakeLists.txt | 2 --
test/implicit/co2/CMakeLists.txt | 2 --
test/implicit/co2ni/CMakeLists.txt | 2 --
test/implicit/mpnc/CMakeLists.txt | 5 -----
test/implicit/richards/CMakeLists.txt | 1 -
test/multidomain/2cnistokes2p2cni/CMakeLists.txt | 2 --
test/multidomain/2cstokes2p2c/CMakeLists.txt | 2 --
18 files changed, 36 deletions(-)
diff --git a/test/decoupled/1p/CMakeLists.txt b/test/decoupled/1p/CMakeLists.txt
index aae229e609..2fdd35971f 100644
--- a/test/decoupled/1p/CMakeLists.txt
+++ b/test/decoupled/1p/CMakeLists.txt
@@ -21,5 +21,3 @@ add_dumux_test(test_diffusion3d test_diffusion3d test_diffusion3d.cc
${CMAKE_CURRENT_BINARY_DIR}/test_diffusion3d_mimetic-00001.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_diffusion3d
-ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_diffusion3d_reference.input)
-add_dune_alugrid_flags(test_diffusion3d)
-add_dune_ug_flags(test_diffusion3d)
diff --git a/test/decoupled/2p/CMakeLists.txt b/test/decoupled/2p/CMakeLists.txt
index d44f78d460..a17bc5cf67 100644
--- a/test/decoupled/2p/CMakeLists.txt
+++ b/test/decoupled/2p/CMakeLists.txt
@@ -11,7 +11,6 @@ add_dumux_test(test_impesadaptive test_impesadaptive test_impesadaptive.cc
${CMAKE_SOURCE_DIR}/test/references/test_2padaptive-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_2padaptive-00007.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_impesadaptive)
-add_dune_alugrid_flags(test_impesadaptive)
add_executable("test_impeswithamg" EXCLUDE_FROM_ALL test_impeswithamg.cc)
if(MPI_FOUND)
@@ -23,8 +22,6 @@ if(MPI_FOUND)
"${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_impeswithamg"
-ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_impeswithamg.input
-TimeManager.TEnd 7e7)
- add_dune_superlu_flags(test_impeswithamg)
- add_dune_mpi_flags(test_impeswithamg)
else()
add_dumux_test(test_impeswithamg test_impeswithamg test_impeswithamg.cc
${CMAKE_SOURCE_DIR}/bin/runTest.sh
@@ -67,5 +64,3 @@ add_dumux_test(test_mpfal2padaptive test_mpfa2p test_mpfa2p.cc
${CMAKE_CURRENT_BINARY_DIR}/test_mpfa2p
-ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_mpfa2p.input
-ModelType MPFALAdaptive)
-add_dune_alugrid_flags(test_mpfa2p)
-add_dune_superlu_flags(test_mpfa2p)
diff --git a/test/decoupled/2p2c/CMakeLists.txt b/test/decoupled/2p2c/CMakeLists.txt
index 9daa470cfb..62b21fc881 100644
--- a/test/decoupled/2p2c/CMakeLists.txt
+++ b/test/decoupled/2p2c/CMakeLists.txt
@@ -4,7 +4,6 @@ add_dumux_test(test_adaptive2p2c2d test_adaptive2p2c2d test_adaptive2p2c2d.cc
${CMAKE_SOURCE_DIR}/test/references/test_adaptive2p2c2d-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_adaptive2p2c2d-00008.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_adaptive2p2c2d)
-add_dune_alugrid_flags(test_adaptive2p2c2d)
add_dumux_test(test_dec2p2c test_dec2p2c test_dec2p2c.cc
${CMAKE_SOURCE_DIR}/bin/runTest.sh
diff --git a/test/freeflow/navierstokes/CMakeLists.txt b/test/freeflow/navierstokes/CMakeLists.txt
index 16daf9ef46..b46e231882 100644
--- a/test/freeflow/navierstokes/CMakeLists.txt
+++ b/test/freeflow/navierstokes/CMakeLists.txt
@@ -4,6 +4,3 @@ add_dumux_test(test_navierstokes test_navierstokes test_navierstokes.cc
${CMAKE_SOURCE_DIR}/test/references/navierstokes-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/navierstokes-00008.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_navierstokes)
-add_dune_superlu_flags(test_navierstokes)
-add_dune_alugrid_flags(test_navierstokes)
-add_dune_ug_flags(test_navierstokes)
diff --git a/test/freeflow/stokes/CMakeLists.txt b/test/freeflow/stokes/CMakeLists.txt
index dac6117ebf..a8f9dabba6 100644
--- a/test/freeflow/stokes/CMakeLists.txt
+++ b/test/freeflow/stokes/CMakeLists.txt
@@ -4,4 +4,3 @@ add_dumux_test(test_stokes test_stokes test_stokes.cc
${CMAKE_SOURCE_DIR}/test/references/stokes-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/stokes-00014.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_stokes)
-add_dune_superlu_flags(test_stokes)
diff --git a/test/freeflow/stokes2c/CMakeLists.txt b/test/freeflow/stokes2c/CMakeLists.txt
index b541c42b0f..247411e8d8 100644
--- a/test/freeflow/stokes2c/CMakeLists.txt
+++ b/test/freeflow/stokes2c/CMakeLists.txt
@@ -4,4 +4,3 @@ add_dumux_test(test_stokes2c test_stokes2c test_stokes2c.cc
${CMAKE_SOURCE_DIR}/test/references/stokes2c-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/stokes2c-00007.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c)
-add_dune_superlu_flags(test_stokes2c)
diff --git a/test/freeflow/stokes2cni/CMakeLists.txt b/test/freeflow/stokes2cni/CMakeLists.txt
index 091da92cd1..e1f4f197e1 100644
--- a/test/freeflow/stokes2cni/CMakeLists.txt
+++ b/test/freeflow/stokes2cni/CMakeLists.txt
@@ -4,5 +4,3 @@ add_dumux_test(test_stokes2cni test_stokes2cni test_stokes2cni.cc
${CMAKE_SOURCE_DIR}/test/references/stokes2cni-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/stokes2cni-00008.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_stokes2cni)
-add_dune_superlu_flags(test_stokes2cni)
-add_dune_umfpack_flags(test_stokes2cni)
diff --git a/test/geomechanics/el1p2c/CMakeLists.txt b/test/geomechanics/el1p2c/CMakeLists.txt
index 48d5ff7703..662c4c3c22 100644
--- a/test/geomechanics/el1p2c/CMakeLists.txt
+++ b/test/geomechanics/el1p2c/CMakeLists.txt
@@ -4,4 +4,3 @@ add_dumux_test(test_el1p2c test_el1p2c test_el1p2c.cc
${CMAKE_SOURCE_DIR}/test/references/el1p2c-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/el1p2c-00015.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_el1p2c)
-add_dune_superlu_flags(test_el1p2c)
diff --git a/test/geomechanics/el2p/CMakeLists.txt b/test/geomechanics/el2p/CMakeLists.txt
index c63ee62700..3b4823d71e 100644
--- a/test/geomechanics/el2p/CMakeLists.txt
+++ b/test/geomechanics/el2p/CMakeLists.txt
@@ -5,4 +5,3 @@ add_dumux_test(test_el2p test_el2p test_el2p.cc
${CMAKE_CURRENT_BINARY_DIR}/el2p-00003.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_el2p
${CMAKE_CURRENT_SOURCE_DIR}/grids/test_el2p.dgf 100 200 100)
-add_dune_superlu_flags(test_el2p)
diff --git a/test/geomechanics/elastic/CMakeLists.txt b/test/geomechanics/elastic/CMakeLists.txt
index d8395760d2..65c20e8fe1 100644
--- a/test/geomechanics/elastic/CMakeLists.txt
+++ b/test/geomechanics/elastic/CMakeLists.txt
@@ -4,4 +4,3 @@ add_dumux_test(test_elastic test_elastic test_elastic.cc
${CMAKE_SOURCE_DIR}/test/references/elasticmatrix-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/elasticmatrix-00002.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_elastic)
-add_dune_superlu_flags(test_elastic)
diff --git a/test/implicit/1p/CMakeLists.txt b/test/implicit/1p/CMakeLists.txt
index 879defce47..f174b5991a 100644
--- a/test/implicit/1p/CMakeLists.txt
+++ b/test/implicit/1p/CMakeLists.txt
@@ -25,5 +25,3 @@ add_dumux_test(test_cc1pwithamg test_cc1pwithamg test_cc1pwithamg.cc
${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/1ptestccwithamg-00002.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_cc1pwithamg)
-
-add_dune_alugrid_flags(test_cc1pwithamg test_box1pwithamg)
diff --git a/test/implicit/2pdfm/CMakeLists.txt b/test/implicit/2pdfm/CMakeLists.txt
index bdf30553c7..d8606118ea 100644
--- a/test/implicit/2pdfm/CMakeLists.txt
+++ b/test/implicit/2pdfm/CMakeLists.txt
@@ -4,5 +4,3 @@ add_dumux_test(test_2pdfm test_2pdfm test_2pdfm.cc
${CMAKE_SOURCE_DIR}/test/references/2pdfm-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/2pdfm-00011.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_2pdfm)
-target_link_libraries(test_2pdfm ${DUNE_LIBS} ${MPI_LIBRARIES})
-add_dune_ug_flags(test_2pdfm)
diff --git a/test/implicit/co2/CMakeLists.txt b/test/implicit/co2/CMakeLists.txt
index 504e1be92c..af86f94561 100644
--- a/test/implicit/co2/CMakeLists.txt
+++ b/test/implicit/co2/CMakeLists.txt
@@ -5,7 +5,6 @@ add_dumux_test(test_boxco2 test_boxco2 test_boxco2.cc
${CMAKE_SOURCE_DIR}/test/references/co2box-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/heterogeneousbox-00020.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_boxco2)
-add_dune_alugrid_flags(test_boxco2)
add_dumux_test(test_ccco2 test_ccco2 test_ccco2.cc
${CMAKE_SOURCE_DIR}/bin/runTest.sh
@@ -13,7 +12,6 @@ add_dumux_test(test_ccco2 test_ccco2 test_ccco2.cc
${CMAKE_SOURCE_DIR}/test/references/co2cc-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/heterogeneouscc-00019.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ccco2)
-add_dune_alugrid_flags(test_ccco2)
add_dumux_test(test_restartco2 test_ccco2 test_ccco2.cc
${CMAKE_SOURCE_DIR}/bin/runTest.sh
diff --git a/test/implicit/co2ni/CMakeLists.txt b/test/implicit/co2ni/CMakeLists.txt
index 2b510e1169..6e7ea0343f 100644
--- a/test/implicit/co2ni/CMakeLists.txt
+++ b/test/implicit/co2ni/CMakeLists.txt
@@ -5,7 +5,6 @@ add_dumux_test(test_boxco2ni test_boxco2ni test_boxco2ni.cc
${CMAKE_SOURCE_DIR}/test/references/co2nibox-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/heterogeneousboxni-00020.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_boxco2ni)
-add_dune_alugrid_flags(test_boxco2ni)
add_dumux_test(test_ccco2ni test_ccco2ni test_ccco2ni.cc
${CMAKE_SOURCE_DIR}/bin/runTest.sh
@@ -13,4 +12,3 @@ add_dumux_test(test_ccco2ni test_ccco2ni test_ccco2ni.cc
${CMAKE_SOURCE_DIR}/test/references/co2nicc-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/heterogeneousccni-00019.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ccco2ni)
-add_dune_alugrid_flags(test_ccco2ni)
diff --git a/test/implicit/mpnc/CMakeLists.txt b/test/implicit/mpnc/CMakeLists.txt
index b564a926c0..d0bd9d586d 100644
--- a/test/implicit/mpnc/CMakeLists.txt
+++ b/test/implicit/mpnc/CMakeLists.txt
@@ -43,8 +43,3 @@ add_dumux_test(test_boxmpncthermalnonequil test_boxmpncthermalnonequil test_boxm
${CMAKE_SOURCE_DIR}/test/references/combustion-reference.vtp
${CMAKE_CURRENT_BINARY_DIR}/combustion-00078.vtp
${CMAKE_CURRENT_BINARY_DIR}/test_boxmpncthermalnonequil)
-add_dune_superlu_flags(test_boxmpncthermalnonequil)
-
-target_link_libraries(test_boxmpnckinetic ${DUNE_LIBS} ${MPI_LIBRARIES})
-add_dune_alugrid_flags(test_boxmpnckinetic)
-add_dune_ug_flags(test_boxmpnckinetic)
diff --git a/test/implicit/richards/CMakeLists.txt b/test/implicit/richards/CMakeLists.txt
index 7439ecfa23..8defc79b55 100644
--- a/test/implicit/richards/CMakeLists.txt
+++ b/test/implicit/richards/CMakeLists.txt
@@ -5,7 +5,6 @@ if(MPI_CXX_FOUND)
${CMAKE_SOURCE_DIR}/test/references/richardslensbox-reference-parallel.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-p0000-richardslensbox-00008.vtu
"${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_boxrichards")
- add_dune_mpi_flags(test_boxrichards)
else()
add_dumux_test(test_boxrichards test_boxrichards test_boxrichards.cc
${CMAKE_SOURCE_DIR}/bin/runTest.sh
diff --git a/test/multidomain/2cnistokes2p2cni/CMakeLists.txt b/test/multidomain/2cnistokes2p2cni/CMakeLists.txt
index c31bfec8bb..46f46054ec 100644
--- a/test/multidomain/2cnistokes2p2cni/CMakeLists.txt
+++ b/test/multidomain/2cnistokes2p2cni/CMakeLists.txt
@@ -7,8 +7,6 @@ add_dumux_test(test_2cnistokes2p2cni_1ff test_2cnistokes2p2cni test_2cnistokes2p
${CMAKE_CURRENT_BINARY_DIR}/test_2cnistokes2p2cni
-ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cnistokes2p2cni_reference.input
)
-add_dune_superlu_flags(test_2cnistokes2p2cni)
-add_dune_ug_flags(test_2cnistokes2p2cni)
# test: test_2cnistokes2p2cni_2pm
add_dumux_test(test_2cnistokes2p2cni_2pm test_2cnistokes2p2cni test_2cnistokes2p2cni.cc
diff --git a/test/multidomain/2cstokes2p2c/CMakeLists.txt b/test/multidomain/2cstokes2p2c/CMakeLists.txt
index 67e425d6d4..077f21b94e 100644
--- a/test/multidomain/2cstokes2p2c/CMakeLists.txt
+++ b/test/multidomain/2cstokes2p2c/CMakeLists.txt
@@ -7,8 +7,6 @@ add_dumux_test(test_2cstokes2p2c_1ff test_2cstokes2p2c test_2cstokes2p2c.cc
${CMAKE_CURRENT_BINARY_DIR}/test_2cstokes2p2c
-ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cstokes2p2c_reference.input
)
-add_dune_superlu_flags(test_2cstokes2p2c)
-add_dune_ug_flags(test_2cstokes2p2c)
# test: test_2cstokes2p2c_2pm
add_dumux_test(test_2cstokes2p2c_2pm test_2cstokes2p2c test_2cstokes2p2c.cc
--
GitLab