From 10d548a4622a719c6d95b16e9aceef4ffebfd364 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Wed, 21 Aug 2013 23:58:09 +0000 Subject: [PATCH] Port tests/metis git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30398 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/CMakeLists.txt | 6 ++++-- tests/metis/CMakeLists.txt | 1 + tests/metis/Makefile | 10 ---------- tests/metis/metis_01.cc | 2 +- tests/metis/{metis_01/cmp/generic => metis_01.output} | 0 tests/metis/metis_02.cc | 2 +- tests/metis/{metis_02/cmp/generic => metis_02.output} | 0 tests/metis/metis_03.cc | 2 +- tests/metis/{metis_03/cmp/generic => metis_03.output} | 0 9 files changed, 8 insertions(+), 15 deletions(-) create mode 100644 tests/metis/CMakeLists.txt delete mode 100644 tests/metis/Makefile rename tests/metis/{metis_01/cmp/generic => metis_01.output} (100%) rename tests/metis/{metis_02/cmp/generic => metis_02.output} (100%) rename tests/metis/{metis_03/cmp/generic => metis_03.output} (100%) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 54978f662e..41594f786d 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -70,7 +70,6 @@ MESSAGE(STATUS "Proceed to test definitions") #$(if $(USE_CONTRIB_PETSC:no=), petsc,) \ #$(if $(USE_CONTRIB_SLEPC:no=), slepc,) \ #$(if $(USE_CONTRIB_TRILINOS:no=), trilinos,) \ -#$(if $(USE_CONTRIB_METIS:no=), metis,) \ #$(if $(USE_CONTRIB_HSL:no=), hsl,) \ #$(if $(USE_CONTRIB_LAPACK:no=), lapack,) @@ -95,7 +94,6 @@ ADD_SUBDIRECTORY(codim_one) #lib #matrix_free #mesh_converter -#metis #mpi #multigrid #petsc @@ -103,6 +101,10 @@ ADD_SUBDIRECTORY(codim_one) #slepc #trilinos +IF(DEAL_II_WITH_METIS) + ADD_SUBDIRECTORY(metis) +ENDIF() + IF(DEAL_II_WITH_UMFPACK) ADD_SUBDIRECTORY(umfpack) ENDIF() diff --git a/tests/metis/CMakeLists.txt b/tests/metis/CMakeLists.txt new file mode 100644 index 0000000000..0efb828f2c --- /dev/null +++ b/tests/metis/CMakeLists.txt @@ -0,0 +1 @@ +DEAL_II_PICKUP_TESTS() diff --git a/tests/metis/Makefile b/tests/metis/Makefile deleted file mode 100644 index 3dc8d027c4..0000000000 --- a/tests/metis/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -############################################################ -# Makefile,v 1.15 2002/06/13 12:51:13 hartmann Exp -# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by the deal.II authors -############################################################ - -include ../Makefile.paths -include $D/common/Make.global_options -include ../Makefile.rules --include Makefile.depend --include Makefile.tests diff --git a/tests/metis/metis_01.cc b/tests/metis/metis_01.cc index df99f4a6f8..5e91e0a609 100644 --- a/tests/metis/metis_01.cc +++ b/tests/metis/metis_01.cc @@ -59,7 +59,7 @@ void test () int main () { - std::ofstream logfile("metis_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/metis/metis_01/cmp/generic b/tests/metis/metis_01.output similarity index 100% rename from tests/metis/metis_01/cmp/generic rename to tests/metis/metis_01.output diff --git a/tests/metis/metis_02.cc b/tests/metis/metis_02.cc index 6ebdde90c2..a8b5d531fa 100644 --- a/tests/metis/metis_02.cc +++ b/tests/metis/metis_02.cc @@ -89,7 +89,7 @@ void test () int main () { - std::ofstream logfile("metis_02/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/metis/metis_02/cmp/generic b/tests/metis/metis_02.output similarity index 100% rename from tests/metis/metis_02/cmp/generic rename to tests/metis/metis_02.output diff --git a/tests/metis/metis_03.cc b/tests/metis/metis_03.cc index 2239ba6a49..dec3fc7c40 100644 --- a/tests/metis/metis_03.cc +++ b/tests/metis/metis_03.cc @@ -84,7 +84,7 @@ void test () int main () { - std::ofstream logfile("metis_03/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/metis/metis_03/cmp/generic b/tests/metis/metis_03.output similarity index 100% rename from tests/metis/metis_03/cmp/generic rename to tests/metis/metis_03.output -- 2.39.5