]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Undo Guido's attempt to include the ILU into the sparse matrix.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 5 May 1999 14:16:32 +0000 (14:16 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 5 May 1999 14:16:32 +0000 (14:16 +0000)
git-svn-id: https://svn.dealii.org/trunk@1278 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/lac/include/lac/sparse_matrix.h
deal.II/lac/include/lac/sparse_matrix.templates.h

index 8c7da6c9846e097bd56be51b540b51d0fe10f034..06ff1a3bb7a849b627c1d86f2ebca01aec6ee7df 100644 (file)
@@ -615,35 +615,6 @@ class SparseMatrix : public Subscriptor
     template <typename somenumber>
     SparseMatrix<number> & copy_from (const SparseMatrix<somenumber> &source);
 
-                                    /**
-                                     * Generate ILU.
-                                     * The matrix entries will contain the
-                                     * incomplete LU-factorization of
-                                     * the matrix #source#. Having a matrix
-                                     * #source# and a matrix structure object
-                                     * #struct#, the code for generating
-                                     * an ILU factorization reads
-                                     * \begin{verbatim}
-                                     * SparseMatrix<float> ilu(struct);
-                                     * ilu.ILU(source);
-                                     * \end{verbatim}
-                                     *
-                                     * If additional side diagonals are
-                                     * needed (ILU(n)-algorithm), you have to
-                                     * construct a second matrix structure:
-                                     * \begin{verbatim}
-                                     * SparseMatrixStruct ilustruct(struct,n);
-                                     * SparseMatrix<float> ilu(ilustruct);
-                                     * ilu.ILU(source);
-                                     * \end{verbatim}
-                                     *
-                                     * After generating the ILU-decomposition,
-                                     * it can be applied to a vector by
-                                     * #backward_forward#.
-                                     */
-    template <typename somenumber>
-    SparseMatrix<number> & ILU (const SparseMatrix<somenumber> &source);
-
                                     /**
                                      * Add #matrix# scaled by #factor# to this
                                      * matrix. The function throws an error
@@ -734,13 +705,6 @@ class SparseMatrix : public Subscriptor
     template <typename somenumber>
     void Tvmult (Vector<somenumber>& dst, const Vector<somenumber>& src) const;
   
-                                    /**
-                                     * Do backward-forward solution of a
-                                     * previously generated ILU.
-                                     */
-    template <typename somenumber>
-    void backward_forward (Vector<somenumber>& v);
-    
                                     /**
                                      * Return the norm of the vector $v$ with
                                      * respect to the norm induced by this
@@ -914,17 +878,12 @@ class SparseMatrix : public Subscriptor
                                     /**
                                      * Exception
                                      */
-    DeclException0 (ExcNoILU);
-                                    /**
-                                     * Exception
-                                     */
     DeclException0 (ExcInvalidConstructorCall);
     
   private:
     SmartPointer<const SparseMatrixStruct> cols;
     number* val;
     unsigned int max_len;
-    bool is_ilu;
     
 
                                     // make all other sparse matrices
index c20d302938ee06936b47e95c869e3e06263a2b83..a2342846fdf96a88b663fc4cd548c0c8767e5547 100644 (file)
@@ -21,8 +21,7 @@ template <typename number>
 SparseMatrix<number>::SparseMatrix () :
                cols(0),
                val(0),
-               max_len(0),
-               is_ilu(false)
+               max_len(0)
 {};
 
 
@@ -44,8 +43,7 @@ template <typename number>
 SparseMatrix<number>::SparseMatrix (const SparseMatrixStruct &c) :
                cols(&c),
                val(0),
-               max_len(0),
-               is_ilu(false)
+               max_len(0)
 {
   reinit();
 };
@@ -84,8 +82,6 @@ SparseMatrix<number>::reinit ()
 
   if (val)
     fill_n (&val[0], cols->vec_len, 0);
-
-  is_ilu = false;
 }
 
 
@@ -108,7 +104,6 @@ SparseMatrix<number>::clear ()
   if (val) delete[] val;
   val = 0;
   max_len = 0;
-  is_ilu = false;
 };
 
 
@@ -147,7 +142,6 @@ SparseMatrix<number>::copy_from (const SparseMatrix<somenumber> &matrix)
   copy (&matrix.val[0], &matrix.val[cols->vec_len],
        &val[0]);
   
-  is_ilu = false;
   return *this;
 };
 
@@ -169,7 +163,6 @@ SparseMatrix<number>::add_scaled (const number factor,
 
   while (val_ptr != end_ptr)
     *val_ptr++ += factor * *matrix_ptr++;
-  is_ilu = false;
 };
 
 

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.