]> https://gitweb.dealii.org/ - dealii.git/commitdiff
projects / dealii.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0669a3d)
Add missing instantiations. 1664/head
authorMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Thu, 24 Sep 2015 05:04:57 +0000 (07:04 +0200)
committerMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Thu, 24 Sep 2015 05:04:57 +0000 (07:04 +0200)
source/lac/sparse_matrix.cc patch | blob | history
source/lac/sparse_matrix.inst.in patch | blob | history
source/lac/sparse_matrix_inst2.cc patch | blob | history

diff --git a/source/lac/sparse_matrix.cc b/source/lac/sparse_matrix.cc
index 4db5f3864518817084e2e105aa19d7b9df5c663e..ae675bbd13e3a445b109450f2562cbf2f22e5958 100644 (file)
--- a/source/lac/sparse_matrix.cc
+++ b/source/lac/sparse_matrix.cc
@@ -15,6 +15,7 @@
 
 #include <deal.II/lac/sparse_matrix.templates.h>
 #include <deal.II/lac/block_vector.h>
+#include <deal.II/lac/parallel_vector.h>
 
 DEAL_II_NAMESPACE_OPEN
 
diff --git a/source/lac/sparse_matrix.inst.in b/source/lac/sparse_matrix.inst.in
index 950bf0dfba4ffe1161883971daf306af3ceefa2c..dee0b31bf53ef6d933da58d6e8f596a9928704c1 100644 (file)
--- a/source/lac/sparse_matrix.inst.in
+++ b/source/lac/sparse_matrix.inst.in
@@ -33,20 +33,20 @@ for (S1, S2 : REAL_SCALARS)
       void SparseMatrix<S1>::copy_from<S2> (const FullMatrix<S2> &);
 
     template void SparseMatrix<S1>::add<S2> (const S1,
-                                            const SparseMatrix<S2> &);
+                                             const SparseMatrix<S2> &);
 
     template void SparseMatrix<S1>::add<S2> (const size_type,
-                                            const size_type,
-                                            const size_type *,
-                                            const S2 *,
-                                            const bool,
-                                            const bool);
+                                             const size_type,
+                                             const size_type *,
+                                             const S2 *,
+                                             const bool,
+                                             const bool);
 
     template void SparseMatrix<S1>::set<S2> (const size_type,
-                                            const size_type,
-                                            const size_type *,
-                                            const S2 *,
-                                            const bool);
+                                             const size_type,
+                                             const size_type *,
+                                             const S2 *,
+                                             const bool);
   }
 
 
@@ -59,69 +59,69 @@ for (S1, S2 : REAL_SCALARS)
     template S2
       SparseMatrix<S1>::
       matrix_scalar_product<S2> (const Vector<S2> &,
-                                const Vector<S2> &) const;
+                                 const Vector<S2> &) const;
 
     template S2 SparseMatrix<S1>::
       residual<S2> (Vector<S2> &,
-                   const Vector<S2> &,
-                   const Vector<S2> &) const;
+                    const Vector<S2> &,
+                    const Vector<S2> &) const;
 
     template void SparseMatrix<S1>::
       precondition_SSOR<S2> (Vector<S2> &,
-                            const Vector<S2> &,
-                            const S1,
-                            const std::vector<std::size_t>&) const;
+                             const Vector<S2> &,
+                             const S1,
+                             const std::vector<std::size_t>&) const;
 
     template void SparseMatrix<S1>::
       precondition_SOR<S2> (Vector<S2> &,
-                           const Vector<S2> &,
-                           const S1) const;
+                            const Vector<S2> &,
+                            const S1) const;
 
     template void SparseMatrix<S1>::
       precondition_TSOR<S2> (Vector<S2> &,
-                            const Vector<S2> &,
-                            const S1) const;
+                             const Vector<S2> &,
+                             const S1) const;
 
     template void SparseMatrix<S1>::
       precondition_Jacobi<S2> (Vector<S2> &,
-                              const Vector<S2> &,
-                              const S1) const;
+                               const Vector<S2> &,
+                               const S1) const;
 
     template void SparseMatrix<S1>::
       SOR<S2> (Vector<S2> &,
-              const S1) const;
+               const S1) const;
     template void SparseMatrix<S1>::
       TSOR<S2> (Vector<S2> &,
-               const S1) const;
+                const S1) const;
     template void SparseMatrix<S1>::
       SSOR<S2> (Vector<S2> &,
-               const S1) const;
+                const S1) const;
     template void SparseMatrix<S1>::
       PSOR<S2> (Vector<S2> &,
-               const std::vector<size_type>&,
-               const std::vector<size_type>&,
-               const S1) const;
+                const std::vector<size_type>&,
+                const std::vector<size_type>&,
+                const S1) const;
     template void SparseMatrix<S1>::
       TPSOR<S2> (Vector<S2> &,
-                const std::vector<size_type>&,
-                const std::vector<size_type>&,
-                const S1) const;
+                 const std::vector<size_type>&,
+                 const std::vector<size_type>&,
+                 const S1) const;
     template void SparseMatrix<S1>::
       Jacobi_step<S2> (Vector<S2> &,
-                      const Vector<S2> &,
-                      const S1) const;
+                       const Vector<S2> &,
+                       const S1) const;
     template void SparseMatrix<S1>::
       SOR_step<S2> (Vector<S2> &,
-                   const Vector<S2> &,
-                   const S1) const;
+                    const Vector<S2> &,
+                    const S1) const;
     template void SparseMatrix<S1>::
       TSOR_step<S2> (Vector<S2> &,
-                    const Vector<S2> &,
-                    const S1) const;
+                     const Vector<S2> &,
+                     const S1) const;
     template void SparseMatrix<S1>::
       SSOR_step<S2> (Vector<S2> &,
-                    const Vector<S2> &,
-                    const S1) const;
+                     const Vector<S2> &,
+                     const S1) const;
   }
 
 for (S1, S2, S3 : REAL_SCALARS;
@@ -137,6 +137,18 @@ for (S1, S2, S3 : REAL_SCALARS;
       Tvmult_add (V1<S2> &, const V2<S3> &) const;
   }
 
+for (S1 : REAL_SCALARS)
+  {
+    template void SparseMatrix<S1>::
+      vmult (parallel::distributed::Vector<S1> &, const parallel::distributed::Vector<S1> &) const;
+    template void SparseMatrix<S1>::
+      Tvmult (parallel::distributed::Vector<S1> &, const parallel::distributed::Vector<S1> &) const;
+    template void SparseMatrix<S1>::
+      vmult_add (parallel::distributed::Vector<S1> &, const parallel::distributed::Vector<S1> &) const;
+    template void SparseMatrix<S1>::
+      Tvmult_add (parallel::distributed::Vector<S1> &, const parallel::distributed::Vector<S1> &) const;
+  }
+
 for (S1, S2, S3: REAL_SCALARS)
   {
     template void SparseMatrix<S1>::
@@ -144,7 +156,7 @@ for (S1, S2, S3: REAL_SCALARS)
              const bool) const;
     template void SparseMatrix<S1>::
       Tmmult (SparseMatrix<S2> &, const SparseMatrix<S3> &, const Vector<S1>&,
-             const bool) const;
+              const bool) const;
   }
 
 
@@ -167,20 +179,20 @@ for (S1, S2 : COMPLEX_SCALARS)
       void SparseMatrix<S1>::copy_from<S2> (const FullMatrix<S2> &);
 
     template void SparseMatrix<S1>::add<S2> (const S1,
-                                            const SparseMatrix<S2> &);
+                                             const SparseMatrix<S2> &);
 
     template void SparseMatrix<S1>::add<S2> (const size_type,
-                                            const size_type,
-                                            const size_type *,
-                                            const S2 *,
-                                            const bool,
-                                            const bool);
+                                             const size_type,
+                                             const size_type *,
+                                             const S2 *,
+                                             const bool,
+                                             const bool);
 
     template void SparseMatrix<S1>::set<S2> (const size_type,
-                                            const size_type,
-                                            const size_type *,
-                                            const S2 *,
-                                            const bool);
+                                             const size_type,
+                                             const size_type *,
+                                             const S2 *,
+                                             const bool);
   }
 
 
@@ -193,69 +205,69 @@ for (S1, S2 : COMPLEX_SCALARS)
     template S2
       SparseMatrix<S1>::
       matrix_scalar_product<S2> (const Vector<S2> &,
-                                const Vector<S2> &) const;
+                                 const Vector<S2> &) const;
 
     template S2 SparseMatrix<S1>::
       residual<S2> (Vector<S2> &,
-                   const Vector<S2> &,
-                   const Vector<S2> &) const;
+                    const Vector<S2> &,
+                    const Vector<S2> &) const;
 
     template void SparseMatrix<S1>::
       precondition_SSOR<S2> (Vector<S2> &,
-                            const Vector<S2> &,
-                            const S1,
-                            const std::vector<std::size_t>&) const;
+                             const Vector<S2> &,
+                             const S1,
+                             const std::vector<std::size_t>&) const;
 
     template void SparseMatrix<S1>::
       precondition_SOR<S2> (Vector<S2> &,
-                           const Vector<S2> &,
-                           const S1) const;
+                            const Vector<S2> &,
+                            const S1) const;
 
     template void SparseMatrix<S1>::
       precondition_TSOR<S2> (Vector<S2> &,
-                            const Vector<S2> &,
-                            const S1) const;
+                             const Vector<S2> &,
+                             const S1) const;
 
     template void SparseMatrix<S1>::
       precondition_Jacobi<S2> (Vector<S2> &,
-                              const Vector<S2> &,
-                              const S1) const;
+                               const Vector<S2> &,
+                               const S1) const;
 
     template void SparseMatrix<S1>::
       SOR<S2> (Vector<S2> &,
-              const S1) const;
+               const S1) const;
     template void SparseMatrix<S1>::
       TSOR<S2> (Vector<S2> &,
-               const S1) const;
+                const S1) const;
     template void SparseMatrix<S1>::
       SSOR<S2> (Vector<S2> &,
-               const S1) const;
+                const S1) const;
     template void SparseMatrix<S1>::
       PSOR<S2> (Vector<S2> &,
-               const std::vector<size_type>&,
-               const std::vector<size_type>&,
-               const S1) const;
+                const std::vector<size_type>&,
+                const std::vector<size_type>&,
+                const S1) const;
     template void SparseMatrix<S1>::
       TPSOR<S2> (Vector<S2> &,
-                const std::vector<size_type>&,
-                const std::vector<size_type>&,
-                const S1) const;
+                 const std::vector<size_type>&,
+                 const std::vector<size_type>&,
+                 const S1) const;
     template void SparseMatrix<S1>::
       Jacobi_step<S2> (Vector<S2> &,
-                      const Vector<S2> &,
-                      const S1) const;
+                       const Vector<S2> &,
+                       const S1) const;
     template void SparseMatrix<S1>::
       SOR_step<S2> (Vector<S2> &,
-                   const Vector<S2> &,
-                   const S1) const;
+                    const Vector<S2> &,
+                    const S1) const;
     template void SparseMatrix<S1>::
       TSOR_step<S2> (Vector<S2> &,
-                    const Vector<S2> &,
-                    const S1) const;
+                     const Vector<S2> &,
+                     const S1) const;
     template void SparseMatrix<S1>::
       SSOR_step<S2> (Vector<S2> &,
-                    const Vector<S2> &,
-                    const S1) const;
+                     const Vector<S2> &,
+                     const S1) const;
   }
 
 for (S1, S2, S3 : COMPLEX_SCALARS;
@@ -278,5 +290,5 @@ for (S1, S2, S3: COMPLEX_SCALARS)
              const bool) const;
     template void SparseMatrix<S1>::
       Tmmult (SparseMatrix<S2> &, const SparseMatrix<S3> &, const Vector<S1>&,
-             const bool) const;
+              const bool) const;
   }
diff --git a/source/lac/sparse_matrix_inst2.cc b/source/lac/sparse_matrix_inst2.cc
index aaa7275f925ca2ec054bdac75ef738a94cd63c1e..44107ffcce8fb5f72a28c626da10eb59797c1f3f 100644 (file)
--- a/source/lac/sparse_matrix_inst2.cc
+++ b/source/lac/sparse_matrix_inst2.cc
@@ -16,6 +16,7 @@
 
 #include <deal.II/lac/sparse_matrix.templates.h>
 #include <deal.II/lac/block_vector.h>
+#include <deal.II/lac/parallel_vector.h>
 
 DEAL_II_NAMESPACE_OPEN
 
Mirror of the development repository for deal.II

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.