]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Fix a couple of issues.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 25 Oct 2006 00:13:36 +0000 (00:13 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 25 Oct 2006 00:13:36 +0000 (00:13 +0000)
git-svn-id: https://svn.dealii.org/trunk@14076 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/lac/source/sparse_direct.cc

index 8c7a2c7bcff171a70cad6eff40741eb032dc562f..da5c303053c52415776c2a9a6653948ef6a6f277 100644 (file)
@@ -1685,7 +1685,7 @@ SparseDirectUMFPACK::clear ()
 template <typename number>
 void
 SparseDirectUMFPACK::
-sort_arrays (const SparseMatrix<number> &)
+sort_arrays (const SparseMatrix<number> &matrix)
 {
                                    // do the copying around of entries
                                    // so that the diagonal entry is in the
@@ -1698,7 +1698,7 @@ sort_arrays (const SparseMatrix<number> &)
                                    // second entry in a row
                                    //
                                    // ignore rows with only one or no entry
-  for (unsigned int row=0; row<N; ++row)
+  for (unsigned int row=0; row<matrix.m(); ++row)
     {
                                        // we may have to move some elements
                                        // that are left of the diagonal but
@@ -1748,7 +1748,7 @@ sort_arrays (const BlockSparseMatrix<number> &matrix)
                                    // columns. we can do the same
                                    // thing as above, but we have to
                                    // do it multiple times
-  for (unsigned int row=0; row<N; ++row)
+  for (unsigned int row=0; row<matrix.m(); ++row)
     {
       int cursor = Ap[row];
       for (unsigned int block=0; block<matrix.n_block_cols(); ++block)
@@ -1768,7 +1768,7 @@ sort_arrays (const BlockSparseMatrix<number> &matrix)
                                          // otherwise swap this entry
                                          // with successive ones as
                                          // long as necessary
-        unsigned int element = cursor;
+        int element = cursor;
         while ((element < Ap[row+1]-1) &&
                (Ai[element] > Ai[element+1]))
           {
@@ -1871,7 +1871,7 @@ factorize (const Matrix &matrix)
                                    // be more careful for block sparse
                                    // matrices, so ship this task out
                                    // to a different function
-  sort_array<Matrix> ();
+  sort_arrays (matrix);
         
   int status;
   status = umfpack_di_symbolic (N, N,

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.