]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Avoid using the deprecated row_iterator types of sparsity patterns. Replace them...
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Wed, 22 Apr 2015 12:12:19 +0000 (07:12 -0500)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Thu, 23 Apr 2015 11:42:54 +0000 (06:42 -0500)
source/lac/petsc_parallel_sparse_matrix.cc

index 7e4c3c7c7b67d397596d33078fc08387e5645ae6..4e1f2fa63acb1d6a9c011312b9642f364d5abed0 100644 (file)
@@ -471,16 +471,10 @@ namespace PETScWrappers
           // from the sparsity pattern.
           {
             PetscInt *ptr = & colnums_in_window[0];
-
             for (PetscInt i=local_row_start; i<local_row_end; ++i)
-              {
-                typename SparsityType::row_iterator
-                row_start = sparsity_pattern.row_begin(i),
-                row_end = sparsity_pattern.row_end(i);
-
-                std::copy(row_start, row_end, ptr);
-                ptr += row_end - row_start;
-              }
+              for (typename SparsityType::iterator p=sparsity_pattern.begin(i);
+                   p != sparsity_pattern.end(i); ++p, ++ptr)
+                *ptr = p->column();
           }
 
 
@@ -698,16 +692,10 @@ namespace PETScWrappers
           // from the sparsity pattern.
           {
             PetscInt *ptr = & colnums_in_window[0];
-
             for (size_type i=local_row_start; i<local_row_end; ++i)
-              {
-                typename SparsityType::row_iterator
-                row_start = sparsity_pattern.row_begin(i),
-                row_end = sparsity_pattern.row_end(i);
-
-                std::copy(row_start, row_end, ptr);
-                ptr += row_end - row_start;
-              }
+              for (typename SparsityType::iterator p=sparsity_pattern.begin(i);
+                   p != sparsity_pattern.end(i); ++p, ++ptr)
+                *ptr = p->column();
           }
 
 

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.