From beeafa5dadce56c237cea0a7b05afa25b6858f7e Mon Sep 17 00:00:00 2001 From: bangerth Date: Thu, 23 Oct 2008 03:30:03 +0000 Subject: [PATCH] We don't support Trilinos full matrix types. git-svn-id: https://svn.dealii.org/trunk@17313 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/trilinos/full_matrix_01.cc | 91 --------------- tests/trilinos/full_matrix_01/cmp/generic | 2 - tests/trilinos/full_matrix_02.cc | 91 --------------- tests/trilinos/full_matrix_02/cmp/generic | 2 - tests/trilinos/full_matrix_03.cc | 97 ---------------- tests/trilinos/full_matrix_03/cmp/generic | 2 - tests/trilinos/full_matrix_04.cc | 71 ------------ tests/trilinos/full_matrix_04/cmp/generic | 2 - tests/trilinos/full_matrix_05.cc | 101 ----------------- tests/trilinos/full_matrix_05/cmp/generic | 3 - tests/trilinos/full_matrix_06.cc | 82 -------------- tests/trilinos/full_matrix_06/cmp/generic | 3 - tests/trilinos/full_matrix_07.cc | 82 -------------- tests/trilinos/full_matrix_07/cmp/generic | 3 - tests/trilinos/full_matrix_08.cc | 87 -------------- tests/trilinos/full_matrix_08/cmp/generic | 3 - tests/trilinos/full_matrix_09.cc | 94 --------------- tests/trilinos/full_matrix_09/cmp/generic | 2 - tests/trilinos/full_matrix_10.cc | 94 --------------- tests/trilinos/full_matrix_10/cmp/generic | 2 - tests/trilinos/full_matrix_iterator_01.cc | 79 ------------- .../full_matrix_iterator_01/cmp/generic | 5 - tests/trilinos/full_matrix_vector_01.cc | 98 ---------------- .../full_matrix_vector_01/cmp/generic | 2 - tests/trilinos/full_matrix_vector_02.cc | 98 ---------------- .../full_matrix_vector_02/cmp/generic | 2 - tests/trilinos/full_matrix_vector_03.cc | 101 ----------------- .../full_matrix_vector_03/cmp/generic | 2 - tests/trilinos/full_matrix_vector_04.cc | 101 ----------------- .../full_matrix_vector_04/cmp/generic | 2 - tests/trilinos/full_matrix_vector_05.cc | 104 ----------------- .../full_matrix_vector_05/cmp/generic | 2 - tests/trilinos/full_matrix_vector_06.cc | 95 ---------------- .../full_matrix_vector_06/cmp/generic | 2 - tests/trilinos/full_matrix_vector_07.cc | 107 ------------------ .../full_matrix_vector_07/cmp/generic | 2 - 36 files changed, 1716 deletions(-) delete mode 100644 tests/trilinos/full_matrix_01.cc delete mode 100644 tests/trilinos/full_matrix_01/cmp/generic delete mode 100644 tests/trilinos/full_matrix_02.cc delete mode 100644 tests/trilinos/full_matrix_02/cmp/generic delete mode 100644 tests/trilinos/full_matrix_03.cc delete mode 100644 tests/trilinos/full_matrix_03/cmp/generic delete mode 100644 tests/trilinos/full_matrix_04.cc delete mode 100644 tests/trilinos/full_matrix_04/cmp/generic delete mode 100644 tests/trilinos/full_matrix_05.cc delete mode 100644 tests/trilinos/full_matrix_05/cmp/generic delete mode 100644 tests/trilinos/full_matrix_06.cc delete mode 100644 tests/trilinos/full_matrix_06/cmp/generic delete mode 100644 tests/trilinos/full_matrix_07.cc delete mode 100644 tests/trilinos/full_matrix_07/cmp/generic delete mode 100644 tests/trilinos/full_matrix_08.cc delete mode 100644 tests/trilinos/full_matrix_08/cmp/generic delete mode 100644 tests/trilinos/full_matrix_09.cc delete mode 100644 tests/trilinos/full_matrix_09/cmp/generic delete mode 100644 tests/trilinos/full_matrix_10.cc delete mode 100644 tests/trilinos/full_matrix_10/cmp/generic delete mode 100644 tests/trilinos/full_matrix_iterator_01.cc delete mode 100644 tests/trilinos/full_matrix_iterator_01/cmp/generic delete mode 100644 tests/trilinos/full_matrix_vector_01.cc delete mode 100644 tests/trilinos/full_matrix_vector_01/cmp/generic delete mode 100644 tests/trilinos/full_matrix_vector_02.cc delete mode 100644 tests/trilinos/full_matrix_vector_02/cmp/generic delete mode 100644 tests/trilinos/full_matrix_vector_03.cc delete mode 100644 tests/trilinos/full_matrix_vector_03/cmp/generic delete mode 100644 tests/trilinos/full_matrix_vector_04.cc delete mode 100644 tests/trilinos/full_matrix_vector_04/cmp/generic delete mode 100644 tests/trilinos/full_matrix_vector_05.cc delete mode 100644 tests/trilinos/full_matrix_vector_05/cmp/generic delete mode 100644 tests/trilinos/full_matrix_vector_06.cc delete mode 100644 tests/trilinos/full_matrix_vector_06/cmp/generic delete mode 100644 tests/trilinos/full_matrix_vector_07.cc delete mode 100644 tests/trilinos/full_matrix_vector_07/cmp/generic diff --git a/tests/trilinos/full_matrix_01.cc b/tests/trilinos/full_matrix_01.cc deleted file mode 100644 index 87c7c6ebaf..0000000000 --- a/tests/trilinos/full_matrix_01.cc +++ /dev/null @@ -1,91 +0,0 @@ -//---------------------------- trilinos_full_matrix_01.cc --------------------------- -// $Id$ -// Version: $Name$ -// -// Copyright (C) 2004, 2005, 2008 by the deal.II authors -// -// This file is subject to QPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. -// -//---------------------------- trilinos_full_matrix_01.cc --------------------------- - - -// check setting elements in a petsc matrix using -// TrilinosWrappers::FullMatrix::set() - -#include "../tests.h" -#include -#include -#include - - -void test (TrilinosWrappers::FullMatrix &m) -{ - // first set a few entries - for (unsigned int i=0; i -#include -#include - - -void test (TrilinosWrappers::FullMatrix &m) -{ - // first set a few entries - for (unsigned int i=0; i -#include -#include - - -void test (TrilinosWrappers::FullMatrix &m) -{ - // first set a few entries - for (unsigned int i=0; i -#include -#include - - -void test (TrilinosWrappers::FullMatrix &m) -{ - Assert (m.m() == 5, ExcInternalError()); - Assert (m.n() == 5, ExcInternalError()); - - deallog << "OK" << std::endl; -} - - - -int main (int argc,char **argv) -{ - std::ofstream logfile("full_matrix_04/output"); - deallog.attach(logfile); - deallog.depth_console(0); - deallog.threshold_double(1.e-10); - - try - { - { - TrilinosWrappers::FullMatrix m (5,5); - test (m); - } - } - catch (std::exception &exc) - { - std::cerr << std::endl << std::endl - << "----------------------------------------------------" - << std::endl; - std::cerr << "Exception on processing: " << std::endl - << exc.what() << std::endl - << "Aborting!" << std::endl - << "----------------------------------------------------" - << std::endl; - - return 1; - } - catch (...) - { - std::cerr << std::endl << std::endl - << "----------------------------------------------------" - << std::endl; - std::cerr << "Unknown exception!" << std::endl - << "Aborting!" << std::endl - << "----------------------------------------------------" - << std::endl; - return 1; - }; -} diff --git a/tests/trilinos/full_matrix_04/cmp/generic b/tests/trilinos/full_matrix_04/cmp/generic deleted file mode 100644 index 0fd8fc12f0..0000000000 --- a/tests/trilinos/full_matrix_04/cmp/generic +++ /dev/null @@ -1,2 +0,0 @@ - -DEAL::OK diff --git a/tests/trilinos/full_matrix_05.cc b/tests/trilinos/full_matrix_05.cc deleted file mode 100644 index fe335416b3..0000000000 --- a/tests/trilinos/full_matrix_05.cc +++ /dev/null @@ -1,101 +0,0 @@ -//---------------------------- trilinos_full_matrix_05.cc --------------------------- -// $Id$ -// Version: $Name$ -// -// Copyright (C) 2004, 2005, 2007, 2008 by the deal.II authors -// -// This file is subject to QPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. -// -//---------------------------- trilinos_full_matrix_05.cc --------------------------- - - -// check querying the number of nonzero elements in -// TrilinosWrappers::FullMatrix - -#include "../tests.h" -#include -#include -#include - - -void test (TrilinosWrappers::FullMatrix &m) -{ - // first set a few entries. count how many - // entries we have - unsigned int counter = 0; - for (unsigned int i=0; i -#include -#include - - -void test (TrilinosWrappers::FullMatrix &m) -{ - // first set a few entries. count how many - // entries we have - for (unsigned int i=0; i -#include -#include - - -void test (TrilinosWrappers::FullMatrix &m) -{ - // first set a few entries. count how many - // entries we have - for (unsigned int i=0; i -#include -#include - - -void test (TrilinosWrappers::FullMatrix &m) -{ - // first set a few entries. count how many - // entries we have - TrilinosScalar norm = 0; - for (unsigned int i=0; i -#include -#include - - -void test (TrilinosWrappers::FullMatrix &m) -{ - // first set a few entries - for (unsigned int i=0; i -#include -#include - - -void test (TrilinosWrappers::FullMatrix &m) -{ - // first set a few entries - for (unsigned int i=0; i -#include -#include - - -void test () -{ - TrilinosWrappers::FullMatrix m(5,5); - m.set (0,0,1); - m.set (1,1,2); - m.set (1,2,3); - m.compress (); - TrilinosWrappers::FullMatrix::const_iterator i = m.begin(); - deallog << i->row() << ' ' << i->column() << ' ' << i->value() << std::endl; - ++i; - deallog << i->row() << ' ' << i->column() << ' ' << i->value() << std::endl; - i++; - deallog << i->row() << ' ' << i->column() << ' ' << i->value() << std::endl; - - deallog << "OK" << std::endl; -} - - - -int main (int argc,char **argv) -{ - std::ofstream logfile("full_matrix_iterator_01/output"); - deallog.attach(logfile); - deallog.depth_console(0); - deallog.threshold_double(1.e-10); - - try - { - { - test (); - } - } - catch (std::exception &exc) - { - std::cerr << std::endl << std::endl - << "----------------------------------------------------" - << std::endl; - std::cerr << "Exception on processing: " << std::endl - << exc.what() << std::endl - << "Aborting!" << std::endl - << "----------------------------------------------------" - << std::endl; - - return 1; - } - catch (...) - { - std::cerr << std::endl << std::endl - << "----------------------------------------------------" - << std::endl; - std::cerr << "Unknown exception!" << std::endl - << "Aborting!" << std::endl - << "----------------------------------------------------" - << std::endl; - return 1; - }; -} diff --git a/tests/trilinos/full_matrix_iterator_01/cmp/generic b/tests/trilinos/full_matrix_iterator_01/cmp/generic deleted file mode 100644 index 144ae94bb8..0000000000 --- a/tests/trilinos/full_matrix_iterator_01/cmp/generic +++ /dev/null @@ -1,5 +0,0 @@ - -DEAL::0 0 1.00000 -DEAL::0 1 0 -DEAL::0 2 0 -DEAL::OK diff --git a/tests/trilinos/full_matrix_vector_01.cc b/tests/trilinos/full_matrix_vector_01.cc deleted file mode 100644 index 108e5b11d3..0000000000 --- a/tests/trilinos/full_matrix_vector_01.cc +++ /dev/null @@ -1,98 +0,0 @@ -//---------------------------- trilinos_full_matrix_vector_01.cc --------------------------- -// $Id$ -// Version: $Name$ -// -// Copyright (C) 2004, 2005, 2008 by the deal.II authors -// -// This file is subject to QPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. -// -//---------------------------- trilinos_full_matrix_vector_01.cc --------------------------- - - -// check FullMatrix::vmult - -#include "../tests.h" -#include -#include -#include -#include -#include - - -void test (TrilinosWrappers::Vector &v, - TrilinosWrappers::Vector &w) -{ - TrilinosWrappers::FullMatrix m(v.size(),v.size()); - for (unsigned int i=0; i -#include -#include -#include -#include - - -void test (TrilinosWrappers::Vector &v, - TrilinosWrappers::Vector &w) -{ - TrilinosWrappers::FullMatrix m(v.size(),v.size()); - for (unsigned int i=0; i -#include -#include -#include -#include - - -void test (TrilinosWrappers::Vector &v, - TrilinosWrappers::Vector &w) -{ - TrilinosWrappers::FullMatrix m(v.size(),v.size()); - for (unsigned int i=0; i -#include -#include -#include -#include - - -void test (TrilinosWrappers::Vector &v, - TrilinosWrappers::Vector &w) -{ - TrilinosWrappers::FullMatrix m(v.size(),v.size()); - for (unsigned int i=0; i -#include -#include -#include -#include - - -void test (TrilinosWrappers::Vector &v, - TrilinosWrappers::Vector &w) -{ - TrilinosWrappers::FullMatrix m(v.size(),v.size()); - for (unsigned int i=0; i - const TrilinosScalar s = m.matrix_scalar_product (w,v); - - // make sure we get the expected result - for (unsigned int i=0; i -#include -#include -#include -#include - - -void test (TrilinosWrappers::Vector &v) -{ - TrilinosWrappers::FullMatrix m(v.size(),v.size()); - for (unsigned int i=0; i - const TrilinosScalar s = m.matrix_norm_square (v); - - // make sure we get the expected result - for (unsigned int i=0; i -#include -#include -#include -#include - - -void test (TrilinosWrappers::Vector &v, - TrilinosWrappers::Vector &w, - TrilinosWrappers::Vector &x) -{ - TrilinosWrappers::FullMatrix m(v.size(),v.size()); - for (unsigned int i=0; i