From ed3ac25ae583d209f38ab1dfba762827fe0090af Mon Sep 17 00:00:00 2001 From: kanschat Date: Wed, 6 Sep 2006 21:04:19 +0000 Subject: [PATCH] put test of lapack functions into own directory git-svn-id: https://svn.dealii.org/trunk@13841 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/lac/Makefile | 2 +- tests/lapack/Makefile | 2 +- .../{lac/lapack.cc => lapack/full_matrix.cc} | 25 +++---------------- .../lapack => lapack/full_matrix}/cmp/generic | 0 4 files changed, 5 insertions(+), 24 deletions(-) rename tests/{lac/lapack.cc => lapack/full_matrix.cc} (78%) rename tests/{lac/lapack => lapack/full_matrix}/cmp/generic (100%) diff --git a/tests/lac/Makefile b/tests/lac/Makefile index be472e2f4d..ea9dbddfb7 100644 --- a/tests/lac/Makefile +++ b/tests/lac/Makefile @@ -28,7 +28,7 @@ tests_x = vector-vector \ block_vector block_vector_* block_matrices \ matrix_lib matrix_out pointer_matrix \ solver eigen \ - sparse_ilu sparse_ilu_t lapack lapack_fill block_minres \ + sparse_ilu sparse_ilu_t lapack_fill block_minres \ identity_matrix* trace diff --git a/tests/lapack/Makefile b/tests/lapack/Makefile index 3a72131993..48d67c28ab 100644 --- a/tests/lapack/Makefile +++ b/tests/lapack/Makefile @@ -20,7 +20,7 @@ default: run-tests ############################################################ -tests_x = tridiagonal_ev1 +tests_x = tridiagonal_ev1 full_matrix # from above list of regular expressions, generate the real set of diff --git a/tests/lac/lapack.cc b/tests/lapack/full_matrix.cc similarity index 78% rename from tests/lac/lapack.cc rename to tests/lapack/full_matrix.cc index ea442450a2..f2b3cd9858 100644 --- a/tests/lac/lapack.cc +++ b/tests/lapack/full_matrix.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005 by the deal.II authors +// Copyright (C) 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -47,13 +47,12 @@ const double rect[] = int main() { - std::ofstream logfile("lapack/output"); + std::ofstream logfile("full_matrix/output"); logfile.precision(3); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); -#ifdef HAVE_LIBLAPACK FullMatrix A(3,4,rect); LAPACKFullMatrix LA(3,4); LA = A; @@ -114,23 +113,5 @@ int main() } v1.reinit(4); - v2.reinit(4); - -#else - // If lapack is not available, this - // test will not complain. - deallog.push("Rect"); - deallog << "operator= (const FullMatrix&) ok" << std::endl; - deallog << "vmult ok" << std::endl; - deallog << "vmult_add ok" << std::endl; - deallog << "Tvmult ok" << std::endl; - deallog << "Tvmult_add ok" << std::endl; - deallog.pop(); - - deallog << "Eigenvalues 5\t0" << std::endl; - deallog << "Eigenvalues 1\t0" << std::endl; - deallog << "Eigenvalues 5\t0" << std::endl; - deallog << "Eigenvalues 5\t0" << std::endl; - deallog.pop(); -#endif + v2.reinit(4); } diff --git a/tests/lac/lapack/cmp/generic b/tests/lapack/full_matrix/cmp/generic similarity index 100% rename from tests/lac/lapack/cmp/generic rename to tests/lapack/full_matrix/cmp/generic -- 2.39.5