]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Port tests/lapack
authorMatthias Maier <tamiko@kyomu.43-1.org>
Thu, 22 Aug 2013 02:12:25 +0000 (02:12 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Thu, 22 Aug 2013 02:12:25 +0000 (02:12 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30401 0785d39b-7218-0410-832d-ea1e28bc413d

22 files changed:
tests/CMakeLists.txt
tests/lapack/CMakeLists.txt [new file with mode: 0644]
tests/lapack/Makefile [deleted file]
tests/lapack/full_matrix_01.cc
tests/lapack/full_matrix_01.output [moved from tests/lapack/full_matrix_01/cmp/generic with 100% similarity]
tests/lapack/full_matrix_02.cc
tests/lapack/full_matrix_02.output [moved from tests/lapack/full_matrix_02/cmp/generic with 100% similarity]
tests/lapack/full_matrix_03.cc
tests/lapack/full_matrix_03.output [moved from tests/lapack/full_matrix_03/cmp/generic with 100% similarity]
tests/lapack/full_matrix_04.cc
tests/lapack/full_matrix_04.output [moved from tests/lapack/full_matrix_04/cmp/generic with 100% similarity]
tests/lapack/full_matrix_04/full_matrix_03/cmp/generic [deleted file]
tests/lapack/full_matrix_05.cc
tests/lapack/full_matrix_05.output [moved from tests/lapack/full_matrix_05/cmp/generic with 100% similarity]
tests/lapack/full_matrix_06.cc
tests/lapack/full_matrix_06.output [moved from tests/lapack/full_matrix_06/cmp/generic with 100% similarity]
tests/lapack/full_matrix_07.cc
tests/lapack/full_matrix_07.output [moved from tests/lapack/full_matrix_07/cmp/generic with 100% similarity]
tests/lapack/solver_cg.cc
tests/lapack/solver_cg.output [moved from tests/lapack/solver_cg/cmp/generic with 100% similarity]
tests/lapack/tridiagonal_ev1.cc
tests/lapack/tridiagonal_ev1.output [moved from tests/lapack/tridiagonal_ev1/cmp/generic with 100% similarity]

index 596c326afa85debbefb0abc5f0c1c6bc2ea0c3d9..b8a7bc51f7bfaf1e250a93010639207df4501f43 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_LAPACK:no=),   lapack,)
 
 #a-framework
 #all-headers
@@ -86,7 +85,6 @@ ADD_SUBDIRECTORY(codim_one)
 #hp
 #integrators
 #lac
-#lapack
 #lib
 #matrix_free
 #mesh_converter
@@ -100,6 +98,10 @@ ADD_SUBDIRECTORY(multigrid)
 #slepc
 #trilinos
 
+IF(DEAL_II_WITH_LAPACK)
+  ADD_SUBDIRECTORY(lapack)
+ENDIF()
+
 IF(DEAL_II_WITH_METIS)
   ADD_SUBDIRECTORY(metis)
 ENDIF()
diff --git a/tests/lapack/CMakeLists.txt b/tests/lapack/CMakeLists.txt
new file mode 100644 (file)
index 0000000..0efb828
--- /dev/null
@@ -0,0 +1 @@
+DEAL_II_PICKUP_TESTS()
diff --git a/tests/lapack/Makefile b/tests/lapack/Makefile
deleted file mode 100644 (file)
index b945959..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-############################################################
-# $Id$
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 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 304d4d476b4fbd1e4f2bfa3509486bccc12a62c0..2384279791498cd21dbc7a2f5918490b084df937 100644 (file)
@@ -98,7 +98,7 @@ void test_rect(unsigned int m, unsigned int n, const double *values)
 
 int main()
 {
-  const std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output");
+  const std::string logname = "output";
   std::ofstream logfile(logname.c_str());
   logfile.precision(3);
   deallog.attach(logfile);
index 016bb8d4e2c92850af1aef1f550d1a2240011837..59371a93d82cb9dd6ee601501ed93178265e289e 100644 (file)
@@ -79,7 +79,7 @@ test(const unsigned int size, const bool nonsymmetric)
 
 int main()
 {
-  const std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output");
+  const std::string logname = "output";
   std::ofstream logfile(logname.c_str());
   logfile.precision(3);
   deallog.attach(logfile);
index 22d70ad69b8c4f3669345e34566b063b28120435..35b55bedad95f2d1b8115ffcd683419d7c24c0d8 100644 (file)
@@ -114,7 +114,7 @@ void test_rect(unsigned int m, unsigned int n, const double *values)
 
 int main()
 {
-  const std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output");
+  const std::string logname = "output";
   std::ofstream logfile(logname.c_str());
   logfile.precision(3);
   deallog.attach(logfile);
index 3ee7b22c894cf6a374128aa51a85f943acc953b9..00a818609dbe601c95aff9ec742f75bf8503e79c 100644 (file)
@@ -116,7 +116,7 @@ void test_rect(unsigned int m, unsigned int n, const double *values)
 
 int main()
 {
-  const std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output");
+  const std::string logname = "output";
   std::ofstream logfile(logname.c_str());
   logfile.precision(3);
   deallog.attach(logfile);
diff --git a/tests/lapack/full_matrix_04/full_matrix_03/cmp/generic b/tests/lapack/full_matrix_04/full_matrix_03/cmp/generic
deleted file mode 100644 (file)
index 57ea1fd..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-
-DEAL:4x4::Singular values 5.00000 5.00000 5.00000 1.00000
-DEAL:4x4::vmult ok
-DEAL:4x4::vmult_add ok
-DEAL:4x4::Tvmult ok
-DEAL:4x4::Tvmult_add ok
-DEAL:4x3::Singular values 16.0315 12.6623 6.13650 0
-DEAL:4x3::vmult ok
-DEAL:4x3::vmult_add ok
-DEAL:4x3::Tvmult ok
-DEAL:4x3::Tvmult_add ok
-DEAL:3x4::Singular values 20.7967 4.30713 1.98624
-DEAL:3x4::vmult ok
-DEAL:3x4::vmult_add ok
-DEAL:3x4::Tvmult ok
-DEAL:3x4::Tvmult_add ok
-DEAL::Eigenvalues 5    0
-DEAL::Eigenvalues 1    0
-DEAL::Eigenvalues 5    0
-DEAL::Eigenvalues 5    0
index 59f06f6e7a6deea4e8dc782a12bfd195ce698076..c6cdbf1df40c88a7bb4c586c584ff075846abad7 100644 (file)
@@ -47,7 +47,7 @@ const double right[] =
 
 int main()
 {
-  const std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output");
+  const std::string logname = "output";
   std::ofstream logfile(logname.c_str());
   logfile.precision(1);
   deallog.attach(logfile);
index 45adba318dfdb05a8cfa94a33c24e172dd678429..1c8720d8e814220257c6481afce7b250127ce156 100644 (file)
@@ -48,7 +48,7 @@ const double right[] =
 
 int main()
 {
-  const std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output");
+  const std::string logname = "output";
   std::ofstream logfile(logname.c_str());
   logfile.precision(1);
   deallog.attach(logfile);
index ed20ae9b6b5d69b942ff651fe0d199a52eb445d4..5c5b489094a0b329a0a04a61f316d00ddb7d9100 100644 (file)
@@ -41,7 +41,7 @@ const double left[] =
 
 int main()
 {
-  const std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output");
+  const std::string logname = "output";
   std::ofstream logfile(logname.c_str());
   logfile.precision(1);
   deallog.attach(logfile);
index 971484e1e7e6702ca8da98d8363f7ba9b6d2a3cc..3984e60207d92945b38ca4159a46a579697c3d15 100644 (file)
@@ -68,7 +68,7 @@ check_Tsolve(SOLVER &solver, const MATRIX &A,
 
 int main()
 {
-  std::ofstream logfile("solver_cg/output");
+  std::ofstream logfile("output");
 //  logfile.setf(std::ios::fixed);
   deallog << std::setprecision(4);
   deallog.attach(logfile);
index e3270b9e16d269ffb3bf8054cf1e29a64d79783c..ee495b41c4cb2d1ef02fb4d8612befcfe1ae9d4f 100644 (file)
@@ -47,7 +47,7 @@ void test_laplacian(unsigned int n)
 
 int main()
 {
-  const std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output");
+  const std::string logname = "output";
   std::ofstream logfile(logname.c_str());
   deallog.attach(logfile);
   deallog.depth_console(0);

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.