driver file moved and TYPE2 renamed to clearer TYPEVEC

git-svn-id: https://svn.dealii.org/trunk@7687 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/lac/include/lac/sparse_matrix.2.templates b/deal.II/lac/include/lac/sparse_matrix.2.templates
deleted file mode 100644 (file)
index 0f664b8..0000000
--- a/deal.II/lac/include/lac/sparse_matrix.2.templates
+++ /dev/null
@@ -1,88 +0,0 @@
-//----------------------------  sparse_matrix.2.templates  ---------------------------
-//    $Id$
-//    Version: $Name$
-//
-//    Copyright (C) 1998, 1999, 2000, 2001, 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.2.templates  ---------------------------
-
-
-// Driver file for SparseMatrix functions with two types.
-
-// TYPEMAT and TYPE2 are defined in sparsematrix?.cc
-
-template SparseMatrix<TYPEMAT> &
-SparseMatrix<TYPEMAT>::copy_from<TYPE2> (const SparseMatrix<TYPE2> &);
-
-template 
-void SparseMatrix<TYPEMAT>::copy_from<TYPE2> (const FullMatrix<TYPE2> &);
-
-template void SparseMatrix<TYPEMAT>::add_scaled<TYPE2> (const TYPEMAT,
-                                                       const SparseMatrix<TYPE2> &);
-
-template void SparseMatrix<TYPEMAT>::vmult<TYPE2> (Vector<TYPE2> &,
-                                                  const Vector<TYPE2> &) const;
-template void SparseMatrix<TYPEMAT>::Tvmult<TYPE2> (Vector<TYPE2> &,
-                                                   const Vector<TYPE2> &) const;
-template void SparseMatrix<TYPEMAT>::vmult_add<TYPE2> (Vector<TYPE2> &,
-                                                      const Vector<TYPE2> &) const;
-template void SparseMatrix<TYPEMAT>::Tvmult_add<TYPE2> (Vector<TYPE2> &,
-                                                       const Vector<TYPE2> &) const;
-
-template TYPE2
-SparseMatrix<TYPEMAT>::matrix_norm_square<TYPE2> (const Vector<TYPE2> &) const;
-
-template TYPE2
-SparseMatrix<TYPEMAT>::matrix_scalar_product<TYPE2> (const Vector<TYPE2> &,
-                                                    const Vector<TYPE2> &) const;
-
-template TYPE2 SparseMatrix<TYPEMAT>::residual<TYPE2> (Vector<TYPE2> &,
-                                                      const Vector<TYPE2> &,
-                                                      const Vector<TYPE2> &) const;
-
-template void SparseMatrix<TYPEMAT>::precondition_SSOR<TYPE2> (Vector<TYPE2> &,
-                                                              const Vector<TYPE2> &,
-                                                              const TYPEMAT) const;
-
-template void SparseMatrix<TYPEMAT>::precondition_SOR<TYPE2> (Vector<TYPE2> &,
-                                                             const Vector<TYPE2> &,
-                                                             const TYPEMAT) const;
-
-template void SparseMatrix<TYPEMAT>::precondition_TSOR<TYPE2> (Vector<TYPE2> &,
-                                                         const Vector<TYPE2> &,
-                                                         const TYPEMAT) const;
-
-template void SparseMatrix<TYPEMAT>::precondition_Jacobi<TYPE2> (Vector<TYPE2> &,
-                                                           const Vector<TYPE2> &,
-                                                           const TYPEMAT) const;
-
-template void SparseMatrix<TYPEMAT>::SOR<TYPE2> (Vector<TYPE2> &,
-                                                const TYPEMAT) const;
-template void SparseMatrix<TYPEMAT>::TSOR<TYPE2> (Vector<TYPE2> &,
-                                                 const TYPEMAT) const;
-template void SparseMatrix<TYPEMAT>::SSOR<TYPE2> (Vector<TYPE2> &,
-                                                 const TYPEMAT) const;
-template void SparseMatrix<TYPEMAT>::PSOR<TYPE2> (
-  Vector<TYPE2> &,
-  const std::vector<unsigned int>&,
-  const std::vector<unsigned int>&,
-  const TYPEMAT) const;
-template void SparseMatrix<TYPEMAT>::TPSOR<TYPE2> (
-  Vector<TYPE2> &,
-  const std::vector<unsigned int>&,
-  const std::vector<unsigned int>&,
-  const TYPEMAT) const;
-template void SparseMatrix<TYPEMAT>::SOR_step<TYPE2> (Vector<TYPE2> &, const Vector<TYPE2> &,
-                                                     const TYPEMAT) const;
-template void SparseMatrix<TYPEMAT>::TSOR_step<TYPE2> (Vector<TYPE2> &,
-                                                      const Vector<TYPE2> &,
-                                                      const TYPEMAT) const;
-template void SparseMatrix<TYPEMAT>::SSOR_step<TYPE2> (Vector<TYPE2> &,
-                                                      const Vector<TYPE2> &, 
-                                                      const TYPEMAT) const;
-

diff --git a/deal.II/lac/source/sparse_matrix.double.cc b/deal.II/lac/source/sparse_matrix.double.cc
index 261e7fd65346d29c41d63cc9b601928e23e6adf3..bec54b5bd04fed992a77f97fec47b18079a3c96b 100644 (file)
--- a/deal.II/lac/source/sparse_matrix.double.cc
+++ b/deal.II/lac/source/sparse_matrix.double.cc
@@ -18,21 +18,21 @@
 
 template class SparseMatrix<TYPEMAT>;
 
-#define TYPE2 float
+#define TYPEVEC float
 
-#include <lac/sparse_matrix.2.templates>
+#include "sparse_matrix.in.h"
 
-#undef TYPE2
-#define TYPE2 double
+#undef TYPEVEC
+#define TYPEVEC double
 
-#include <lac/sparse_matrix.2.templates>
+#include "sparse_matrix.in.h"
 
                                 // a prerelease of gcc3.0 fails to
                                 // compile this due to long double
-//  #undef TYPE2
-//  #define TYPE2 long double
+//  #undef TYPEVEC
+//  #define TYPEVEC long double
 
 //  #include <lac/sparse_matrix.2.templates>
 
-#undef TYPE2
+#undef TYPEVEC
 #undef TYPEMAT

diff --git a/deal.II/lac/source/sparse_matrix.float.cc b/deal.II/lac/source/sparse_matrix.float.cc
index 633398e92d29c713d18b6db13f8b8a3a8fdb8b17..c5baea8a8e188b45ecdf18bbaddfad1a1bb06b4b 100644 (file)
--- a/deal.II/lac/source/sparse_matrix.float.cc
+++ b/deal.II/lac/source/sparse_matrix.float.cc
@@ -14,24 +14,25 @@
 
 #include <lac/sparse_matrix.templates.h>
 
-
 #define TYPEMAT float
 
 template class SparseMatrix<TYPEMAT>;
 
+#define TYPEVEC float
 
-#define TYPE2 float
-
-#include <lac/sparse_matrix.2.templates>
+#include "sparse_matrix.in.h"
 
-#undef TYPE2
-#define TYPE2 double
+#undef TYPEVEC
+#define TYPEVEC double
 
-#include <lac/sparse_matrix.2.templates>
+#include "sparse_matrix.in.h"
 
                                 // a prerelease of gcc3.0 fails to
                                 // compile this due to long double
-//  #undef TYPE2
-//  #define TYPE2 long double
+//  #undef TYPEVEC
+//  #define TYPEVEC long double
 
 //  #include <lac/sparse_matrix.2.templates>
+
+#undef TYPEVEC
+#undef TYPEMAT

diff --git a/deal.II/lac/source/sparse_matrix.in.h b/deal.II/lac/source/sparse_matrix.in.h
new file mode 100644 (file)
index 0000000..4417d0d
--- /dev/null
+++ b/deal.II/lac/source/sparse_matrix.in.h
@@ -0,0 +1,65 @@
+//---------------------------------------------------------------------------
+//    $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.
+//
+//---------------------------------------------------------------------------
+
+
+// File copied from sparse_matrix.2.templates.h and modified
+
+// Driver file for SparseMatrixEZ functions with two types.
+
+// TYPEMAT and TYPE2 are defined in sparsematrix?.cc
+
+//template SparseMatrixEZ<TYPEMAT> &
+//SparseMatrixEZ<TYPEMAT>::copy_from<TYPE2> (const SparseMatrixEZ<TYPE2> &);
+
+//template 
+//void SparseMatrixEZ<TYPEMAT>::copy_from<TYPE2> (const FullMatrix<TYPE2> &);
+
+//template void SparseMatrixEZ<TYPEMAT>::add_scaled<TYPE2> (const TYPEMAT,
+//                                                       const SparseMatrixEZ<TYPE2> &);
+
+template void SparseMatrixEZ<TYPEMAT>::vmult<TYPEVEC> (Vector<TYPEVEC> &,
+                                                    const Vector<TYPEVEC> &) const;
+template void SparseMatrixEZ<TYPEMAT>::Tvmult<TYPEVEC> (Vector<TYPEVEC> &,
+                                                     const Vector<TYPEVEC> &) const;
+template void SparseMatrixEZ<TYPEMAT>::vmult_add<TYPEVEC> (Vector<TYPEVEC> &,
+                                                        const Vector<TYPEVEC> &) const;
+template void SparseMatrixEZ<TYPEMAT>::Tvmult_add<TYPEVEC> (Vector<TYPEVEC> &,
+                                                         const Vector<TYPEVEC> &) const;
+
+//template TYPEVEC
+//SparseMatrixEZ<TYPEMAT>::matrix_norm_square<TYPEVEC> (const Vector<TYPEVEC> &) const;
+
+//template TYPEVEC
+//SparseMatrixEZ<TYPEMAT>::matrix_scalar_product<TYPEVEC> (const Vector<TYPEVEC> &,
+//                                                    const Vector<TYPEVEC> &) const;
+
+//template TYPEVEC SparseMatrixEZ<TYPEMAT>::residual<TYPEVEC> (Vector<TYPEVEC> &,
+//                                                      const Vector<TYPEVEC> &,
+//                                                      const Vector<TYPEVEC> &) const;
+
+template void SparseMatrixEZ<TYPEMAT>::precondition_SSOR<TYPEVEC> (Vector<TYPEVEC> &,
+                                                                const Vector<TYPEVEC> &,
+                                                                const TYPEMAT) const;
+
+template void SparseMatrixEZ<TYPEMAT>::precondition_SOR<TYPEVEC> (Vector<TYPEVEC> &,
+                                                               const Vector<TYPEVEC> &,
+                                                               const TYPEMAT) const;
+
+template void SparseMatrixEZ<TYPEMAT>::precondition_TSOR<TYPEVEC> (Vector<TYPEVEC> &,
+                                                                const Vector<TYPEVEC> &,
+                                                                const TYPEMAT) const;
+
+template void SparseMatrixEZ<TYPEMAT>::precondition_Jacobi<TYPEVEC> (Vector<TYPEVEC> &,
+                                                                  const Vector<TYPEVEC> &,
+                                                                  const TYPEMAT) const;
+