From 7710ba60aebcac1848fe5f06d6ee7387964aab0d Mon Sep 17 00:00:00 2001 From: guido Date: Sun, 1 Jun 2003 16:39:59 +0000 Subject: [PATCH] ez driver file moved git-svn-id: https://svn.dealii.org/trunk@7716 0785d39b-7218-0410-832d-ea1e28bc413d --- .../include/lac/sparse_matrix_ez.2.templates | 65 ------------------- deal.II/lac/source/sparse_matrix_ez.double.cc | 14 ++-- deal.II/lac/source/sparse_matrix_ez.float.cc | 19 +++--- .../lac/source/sparse_matrix_ez_vector.in.h | 64 ++++++++++++++++++ 4 files changed, 79 insertions(+), 83 deletions(-) delete mode 100644 deal.II/lac/include/lac/sparse_matrix_ez.2.templates create mode 100644 deal.II/lac/source/sparse_matrix_ez_vector.in.h diff --git a/deal.II/lac/include/lac/sparse_matrix_ez.2.templates b/deal.II/lac/include/lac/sparse_matrix_ez.2.templates deleted file mode 100644 index ae08517b39..0000000000 --- a/deal.II/lac/include/lac/sparse_matrix_ez.2.templates +++ /dev/null @@ -1,65 +0,0 @@ -//---------------------------- sparse_matrix_ez.2.templates --------------------------- -// $Id$ -// Version: $Name$ -// -// Copyright (C) 2002, 2003 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. -// -//---------------------------- sparse_matrix_ez.2.templates --------------------------- - - -// File copied from sparse_matrix.2.templates and modified - -// Driver file for SparseMatrixEZ functions with two types. - -// TYPEMAT and TYPE2 are defined in sparsematrix?.cc - -//template SparseMatrixEZ & -//SparseMatrixEZ::copy_from (const SparseMatrixEZ &); - -//template -//void SparseMatrixEZ::copy_from (const FullMatrix &); - -//template void SparseMatrixEZ::add_scaled (const TYPEMAT, -// const SparseMatrixEZ &); - -template void SparseMatrixEZ::vmult (Vector &, - const Vector &) const; -template void SparseMatrixEZ::Tvmult (Vector &, - const Vector &) const; -template void SparseMatrixEZ::vmult_add (Vector &, - const Vector &) const; -template void SparseMatrixEZ::Tvmult_add (Vector &, - const Vector &) const; - -//template TYPE2 -//SparseMatrixEZ::matrix_norm_square (const Vector &) const; - -//template TYPE2 -//SparseMatrixEZ::matrix_scalar_product (const Vector &, -// const Vector &) const; - -//template TYPE2 SparseMatrixEZ::residual (Vector &, -// const Vector &, -// const Vector &) const; - -template void SparseMatrixEZ::precondition_SSOR (Vector &, - const Vector &, - const TYPEMAT) const; - -template void SparseMatrixEZ::precondition_SOR (Vector &, - const Vector &, - const TYPEMAT) const; - -template void SparseMatrixEZ::precondition_TSOR (Vector &, - const Vector &, - const TYPEMAT) const; - -template void SparseMatrixEZ::precondition_Jacobi (Vector &, - const Vector &, - const TYPEMAT) const; - diff --git a/deal.II/lac/source/sparse_matrix_ez.double.cc b/deal.II/lac/source/sparse_matrix_ez.double.cc index 74cf27c864..bb24ae92d7 100644 --- a/deal.II/lac/source/sparse_matrix_ez.double.cc +++ b/deal.II/lac/source/sparse_matrix_ez.double.cc @@ -20,14 +20,13 @@ template class SparseMatrixEZ; -#define TYPE2 float +#define TYPEVEC float +#include "sparse_matrix_ez_vector.in.h" +#undef TYPEVEC -#include - -#undef TYPE2 -#define TYPE2 double - -#include +#define TYPEVEC double +#include "sparse_matrix_ez_vector.in.h" +#undef TYPEVEC // a prerelease of gcc3.0 fails to // compile this due to long double @@ -36,5 +35,4 @@ template class SparseMatrixEZ; // #include -#undef TYPE2 #undef TYPEMAT diff --git a/deal.II/lac/source/sparse_matrix_ez.float.cc b/deal.II/lac/source/sparse_matrix_ez.float.cc index c4e92a7c96..b60b0ee3a7 100644 --- a/deal.II/lac/source/sparse_matrix_ez.float.cc +++ b/deal.II/lac/source/sparse_matrix_ez.float.cc @@ -1,4 +1,4 @@ -//------------------------------------------------------------------------- +//------------------------------------------------------------------------ // $Id$ // Version: $Name$ // @@ -9,7 +9,8 @@ // to the file deal.II/doc/license.html for the text and // further information on this license. // -//------------------------------------------------------------------------- +//------------------------------------------------------------------------ + #include #include @@ -19,14 +20,13 @@ template class SparseMatrixEZ; -#define TYPE2 float - -#include - -#undef TYPE2 -#define TYPE2 double +#define TYPEVEC float +#include "sparse_matrix_ez_vector.in.h" +#undef TYPEVEC -#include +#define TYPEVEC double +#include "sparse_matrix_ez_vector.in.h" +#undef TYPEVEC // a prerelease of gcc3.0 fails to // compile this due to long double @@ -35,5 +35,4 @@ template class SparseMatrixEZ; // #include -#undef TYPE2 #undef TYPEMAT diff --git a/deal.II/lac/source/sparse_matrix_ez_vector.in.h b/deal.II/lac/source/sparse_matrix_ez_vector.in.h new file mode 100644 index 0000000000..ca81e7ca86 --- /dev/null +++ b/deal.II/lac/source/sparse_matrix_ez_vector.in.h @@ -0,0 +1,64 @@ +//---------------------------- sparse_matrix_ez.2.templates --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 2002, 2003 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. +// +//---------------------------- sparse_matrix_ez.2.templates --------------------------- + + +// File copied from sparse_matrix.2.templates and modified + +// Driver file for SparseMatrixEZ functions with two types. + +// TYPEMAT and TYPEVEC are defined in sparse_matrix_ez?.cc + +template void SparseMatrixEZ::vmult ( + Vector &, + const Vector &) const; +template void SparseMatrixEZ::Tvmult ( + Vector &, + const Vector &) const; +template void SparseMatrixEZ::vmult_add ( + Vector &, + const Vector &) const; +template void SparseMatrixEZ::Tvmult_add ( + Vector &, + const Vector &) const; + +//template TYPEVEC +//SparseMatrixEZ::matrix_norm_square (const Vector &) const; + +//template TYPEVEC +//SparseMatrixEZ::matrix_scalar_product (const Vector &, +// const Vector &) const; + +//template TYPEVEC SparseMatrixEZ::residual (Vector &, +// const Vector &, +// const Vector &) const; + +template void SparseMatrixEZ::precondition_SSOR ( + Vector &, + const Vector &, + const TYPEMAT) const; + +template void SparseMatrixEZ::precondition_SOR ( + Vector &, + const Vector &, + const TYPEMAT) const; + +template void SparseMatrixEZ::precondition_TSOR ( + Vector &, + const Vector &, + const TYPEMAT) const; + +template void SparseMatrixEZ::precondition_Jacobi ( + Vector &, + const Vector &, + const TYPEMAT) const; + -- 2.39.5