]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Port tests/metis
authorMatthias Maier <tamiko@kyomu.43-1.org>
Wed, 21 Aug 2013 23:58:09 +0000 (23:58 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Wed, 21 Aug 2013 23:58:09 +0000 (23:58 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30398 0785d39b-7218-0410-832d-ea1e28bc413d

tests/CMakeLists.txt
tests/metis/CMakeLists.txt [new file with mode: 0644]
tests/metis/Makefile [deleted file]
tests/metis/metis_01.cc
tests/metis/metis_01.output [moved from tests/metis/metis_01/cmp/generic with 100% similarity]
tests/metis/metis_02.cc
tests/metis/metis_02.output [moved from tests/metis/metis_02/cmp/generic with 100% similarity]
tests/metis/metis_03.cc
tests/metis/metis_03.output [moved from tests/metis/metis_03/cmp/generic with 100% similarity]

index 54978f662ef9ca796395f1c5bdda853b3de5bf6b..41594f786d6d10237ebd0ebfd66f94f32fcc3094 100644 (file)
@@ -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 (file)
index 0000000..0efb828
--- /dev/null
@@ -0,0 +1 @@
+DEAL_II_PICKUP_TESTS()
diff --git a/tests/metis/Makefile b/tests/metis/Makefile
deleted file mode 100644 (file)
index 3dc8d02..0000000
+++ /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
index df99f4a6f89fb1c1812dc569ae5bde7f4d066b0c..5e91e0a6096c8fcc60e954769b126e2059a1124a 100644 (file)
@@ -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);
index 6ebdde90c25fab75015f9a432377fd8842a6108c..a8b5d531facad6a36e9269ee1c416e362ca604d5 100644 (file)
@@ -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);
index 2239ba6a499800ae94fd93bda1743a3b1c908ab9..dec3fc7c4028fcf64496fe81fc1ff84c6cd17ff9 100644 (file)
@@ -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);

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.