ez driver file moved

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

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 (file)
index ae08517..0000000
--- 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<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<TYPE2> (Vector<TYPE2> &,
-                                                    const Vector<TYPE2> &) const;
-template void SparseMatrixEZ<TYPEMAT>::Tvmult<TYPE2> (Vector<TYPE2> &,
-                                                     const Vector<TYPE2> &) const;
-template void SparseMatrixEZ<TYPEMAT>::vmult_add<TYPE2> (Vector<TYPE2> &,
-                                                        const Vector<TYPE2> &) const;
-template void SparseMatrixEZ<TYPEMAT>::Tvmult_add<TYPE2> (Vector<TYPE2> &,
-                                                         const Vector<TYPE2> &) const;
-
-//template TYPE2
-//SparseMatrixEZ<TYPEMAT>::matrix_norm_square<TYPE2> (const Vector<TYPE2> &) const;
-
-//template TYPE2
-//SparseMatrixEZ<TYPEMAT>::matrix_scalar_product<TYPE2> (const Vector<TYPE2> &,
-//                                                    const Vector<TYPE2> &) const;
-
-//template TYPE2 SparseMatrixEZ<TYPEMAT>::residual<TYPE2> (Vector<TYPE2> &,
-//                                                      const Vector<TYPE2> &,
-//                                                      const Vector<TYPE2> &) const;
-
-template void SparseMatrixEZ<TYPEMAT>::precondition_SSOR<TYPE2> (Vector<TYPE2> &,
-                                                                const Vector<TYPE2> &,
-                                                                const TYPEMAT) const;
-
-template void SparseMatrixEZ<TYPEMAT>::precondition_SOR<TYPE2> (Vector<TYPE2> &,
-                                                               const Vector<TYPE2> &,
-                                                               const TYPEMAT) const;
-
-template void SparseMatrixEZ<TYPEMAT>::precondition_TSOR<TYPE2> (Vector<TYPE2> &,
-                                                                const Vector<TYPE2> &,
-                                                                const TYPEMAT) const;
-
-template void SparseMatrixEZ<TYPEMAT>::precondition_Jacobi<TYPE2> (Vector<TYPE2> &,
-                                                                  const Vector<TYPE2> &,
-                                                                  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 74cf27c8642164d2aefc80a08c183a20b2c2f268..bb24ae92d733e7f391e75262f606568c8f1e7a35 100644 (file)
--- 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<TYPEMAT>;
 
-#define TYPE2 float
+#define TYPEVEC float
+#include "sparse_matrix_ez_vector.in.h"
+#undef TYPEVEC
 
-#include <lac/sparse_matrix_ez.2.templates>
-
-#undef TYPE2
-#define TYPE2 double
-
-#include <lac/sparse_matrix_ez.2.templates>
+#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<TYPEMAT>;
 
 //  #include <lac/sparse_matrix.2.templates>
 
-#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 c4e92a7c96cdd3dd60f4d0e6762443ac45ad4c97..b60b0ee3a7cf3013ffae42897b74e7eaef8fcade 100644 (file)
--- 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 <base/logstream.h>
 #include <lac/sparse_matrix_ez.templates.h>
@@ -19,14 +20,13 @@
 
 template class SparseMatrixEZ<TYPEMAT>;
 
-#define TYPE2 float
-
-#include <lac/sparse_matrix_ez.2.templates>
-
-#undef TYPE2
-#define TYPE2 double
+#define TYPEVEC float
+#include "sparse_matrix_ez_vector.in.h"
+#undef TYPEVEC
 
-#include <lac/sparse_matrix_ez.2.templates>
+#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<TYPEMAT>;
 
 //  #include <lac/sparse_matrix.2.templates>
 
-#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 (file)
index 0000000..ca81e7c
--- /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<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;
+