]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Remove some non-implemented functions, straighten rest of interface.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 6 Aug 1999 17:25:22 +0000 (17:25 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 6 Aug 1999 17:25:22 +0000 (17:25 +0000)
git-svn-id: https://svn.dealii.org/trunk@1629 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/lac/include/lac/sparse_vanka.h
deal.II/lac/include/lac/sparse_vanka.templates.h
deal.II/lac/source/sparse_vanka.cc

index 3f8265e8b5bc41398597ffb0b8ea50d05ee7e348..a4b7cd9a3236913f04c29c9c0b41e62f62f15d0c 100644 (file)
@@ -110,38 +110,15 @@ class SparseVanka
     ~SparseVanka();
     
                                     /**
-                                     * Do the preconditioning. This
-                                     * function contains a dispatch
-                                     * mechanism to use the
-                                     * multiplicative version by
-                                     * default and the additive version
-                                     * if requested by #set_additive#.
-                                     */
-    template<typename number2>
-    void operator() (Vector<number2>       &dst,
-                    const Vector<number2> &src) const;
-
-                                    /**
-                                     * Application of the Vanka operator.
+                                     * Do the preconditioning.
                                      * This function takes the residual
                                      * in #src# and returns the resulting
                                      * update vector in #dst#.
                                      */
     template<typename number2>
-    void forward (Vector<number2>       &dst,
-                 const Vector<number2> &src) const;
-    
-                                    /**
-                                     * Application of the transpose
-                                     * Vanka operator.
-                                     * This function takes the residual
-                                     * in #src# and returns the resulting
-                                     * update vector in #dst#.
-                                     */
-    template<typename number2>
-    void backward (Vector<number2>       &dst,
-                  const Vector<number2> &src) const;
-    
+    void operator() (Vector<number2>       &dst,
+                    const Vector<number2> &src) const;
+
                                     /**
                                      * Minimize memory consumption.
                                      * Activating this option reduces
@@ -187,19 +164,6 @@ class SparseVanka
 
 
 
-/* ---------------------------- Inline functions -----------------------*/
-
-template<typename number>
-template<typename number2>
-inline
-void
-SparseVanka<number>::operator() (Vector<number2>& dst,
-                                const Vector<number2>& src) const
-{
-  dst = 0.;
-  forward(dst, src);
-}
-
 
 
 
index 2e6ede0d2a8242435ba44c6ecb86ac73a0be91b7..5d66fda67a5bb4bec506c5039d7703ada3a55695 100644 (file)
@@ -41,9 +41,11 @@ SparseVanka<number>::~SparseVanka()
 template<typename number>
 template<typename number2>
 void
-SparseVanka<number>::forward(Vector<number2>& dst,
-                          const Vector<number2>& src) const
+SparseVanka<number>::operator ()(Vector<number2>       &dst,
+                                const Vector<number2> &src) const
 {
+                                  // first set output vector to zero
+  dst.clear ();
                                   // first define an alias to the sparsity
                                   // pattern of the matrix, since this
                                   // will be used quite often
index b77c0765ae09bac831d6e0a1acfccef4d98a9f81..7522b0de04362b595409a144df877ea914ae5837 100644 (file)
@@ -7,11 +7,7 @@
 template class SparseVanka<float>;
 template class SparseVanka<double>;
 
-template void SparseVanka<double>::forward (Vector<float>       &dst,
-                                           const Vector<float> &src) const;
-template void SparseVanka<double>::forward (Vector<double>       &dst,
-                                           const Vector<double> &src) const;
-template void SparseVanka<float>::forward (Vector<float>       &dst,
-                                          const Vector<float> &src) const;
-template void SparseVanka<float>::forward (Vector<double>       &dst,
-                                          const Vector<double> &src) const;
+template void SparseVanka<double>::operator () (Vector<float>       &dst,
+                                               const Vector<float> &src) const;
+template void SparseVanka<double>::operator () (Vector<double>       &dst,
+                                               const Vector<double> &src) const;

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.