Remove deprecated function SparseMatrix::global_entry().

diff --git a/doc/news/changes.h b/doc/news/changes.h
index 66902ba442243b0490cb975f4b18348b80586680..fa4556fab452ff3e1738a83e0de014b09928aba1 100644 (file)
--- a/doc/news/changes.h
+++ b/doc/news/changes.h
@@ -175,7 +175,7 @@ inconvenience this causes.
   - PETScWrappers::MPI::Vector constructors and reinit variants.
   - SparseMatrixIterators::Accessor and SparseMatrixIterators::Iterator
     constructors.
-  - SparseMatrix::raw_entry.
+  - SparseMatrix::raw_entry and SparseMatrix::global_entry.
 
   <br>
   <em>With headers in <code>deal.II/deal.II/</code>:</em>

diff --git a/include/deal.II/lac/sparse_matrix.h b/include/deal.II/lac/sparse_matrix.h
index 38156d2efc871a26a6c005644ee33b4452dabb67..3966ad640c71088a336bdb0880c7a5430583b9f8 100644 (file)
--- a/include/deal.II/lac/sparse_matrix.h
+++ b/include/deal.II/lac/sparse_matrix.h
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 1999 - 2014 by the deal.II authors
+// Copyright (C) 1999 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -997,28 +997,6 @@ public:
    */
   number &diag_element (const size_type i);
 
-  /**
-   * This is for hackers. Get access to the <i>i</i>th element of this matrix.
-   * The elements are stored in a consecutive way, refer to the
-   * SparsityPattern class for more details.
-   *
-   * You should use this interface very carefully and only if you are
-   * absolutely sure to know what you do. You should also note that the
-   * structure of these arrays may change over time.  If you change the layout
-   * yourself, you should also rename this function to avoid programs relying
-   * on outdated information!
-   *
-   * @deprecated Use iterator or const_iterator instead!
-   */
-  number global_entry (const size_type i) const DEAL_II_DEPRECATED;
-
-  /**
-   * Same as above, but with write access.  You certainly know what you do?
-   *
-   * @deprecated Use iterator or const_iterator instead!
-   */
-  number &global_entry (const size_type i) DEAL_II_DEPRECATED;
-
 //@}
   /**
    * @name Multiplications
@@ -1932,32 +1910,6 @@ number &SparseMatrix<number>::diag_element (const size_type i)
 
 
 
-template <typename number>
-inline
-number SparseMatrix<number>::global_entry (const size_type j) const
-{
-  Assert (cols != 0, ExcNotInitialized());
-  Assert (j < cols->n_nonzero_elements(),
-          ExcIndexRange (j, 0, cols->n_nonzero_elements()));
-
-  return val[j];
-}
-
-
-
-template <typename number>
-inline
-number &SparseMatrix<number>::global_entry (const size_type j)
-{
-  Assert (cols != 0, ExcNotInitialized());
-  Assert (j < cols->n_nonzero_elements(),
-          ExcIndexRange (j, 0, cols->n_nonzero_elements()));
-
-  return val[j];
-}
-
-
-
 template <typename number>
 template <typename ForwardIterator>
 void

diff --git a/tests/deal.II/create_laplace_matrix_01.cc b/tests/deal.II/create_laplace_matrix_01.cc
index 25eb0d01225dceaa343cb582a631cdb9eb166521..2448982471ed3955788846557ed886c60a23bd61 100644 (file)
--- a/tests/deal.II/create_laplace_matrix_01.cc
+++ b/tests/deal.II/create_laplace_matrix_01.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2000 - 2014 by the deal.II authors
+// Copyright (C) 2000 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -110,8 +110,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 
   deallog << "RHS vector: " << std::endl;

diff --git a/tests/deal.II/create_laplace_matrix_01b.cc b/tests/deal.II/create_laplace_matrix_01b.cc
index 7113cacb77c3bc1ced02fa27cdc57ba42e0cd23f..59b106b89202acba6919bdf721226cd89d6dc461 100644 (file)
--- a/tests/deal.II/create_laplace_matrix_01b.cc
+++ b/tests/deal.II/create_laplace_matrix_01b.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2000 - 2014 by the deal.II authors
+// Copyright (C) 2000 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -106,8 +106,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 }
 

diff --git a/tests/deal.II/create_laplace_matrix_02.cc b/tests/deal.II/create_laplace_matrix_02.cc
index b57c8de9b933ec53683c08470d736f8192e892ad..28bbf450b04854c29dc3c3bb3376f07e42b82260 100644 (file)
--- a/tests/deal.II/create_laplace_matrix_02.cc
+++ b/tests/deal.II/create_laplace_matrix_02.cc
@@ -113,8 +113,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 
   deallog << "RHS vector: " << std::endl;

diff --git a/tests/deal.II/create_laplace_matrix_02b.cc b/tests/deal.II/create_laplace_matrix_02b.cc
index 9fec82c7c2eb8f8c3c6f0b5f7a7652f4bef6bc7b..81fdc6ccfbe5d97a790081ef711868d032d7b20b 100644 (file)
--- a/tests/deal.II/create_laplace_matrix_02b.cc
+++ b/tests/deal.II/create_laplace_matrix_02b.cc
@@ -109,8 +109,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 }
 

diff --git a/tests/deal.II/create_laplace_matrix_03.cc b/tests/deal.II/create_laplace_matrix_03.cc
index 2240fe5318275af615e527adb17909db2a938afa..dbb752bf966c7d82e2b064e56c113dc802a9f250 100644 (file)
--- a/tests/deal.II/create_laplace_matrix_03.cc
+++ b/tests/deal.II/create_laplace_matrix_03.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2000 - 2014 by the deal.II authors
+// Copyright (C) 2000 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -110,8 +110,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 
   deallog << "RHS vector: " << std::endl;

diff --git a/tests/deal.II/create_laplace_matrix_03b.cc b/tests/deal.II/create_laplace_matrix_03b.cc
index 7e21b35bf96ce25c0192400e9d0cbdde71c6f28d..71f75b01af62c7759755bc206fecb9b3b1eeb5fd 100644 (file)
--- a/tests/deal.II/create_laplace_matrix_03b.cc
+++ b/tests/deal.II/create_laplace_matrix_03b.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2000 - 2014 by the deal.II authors
+// Copyright (C) 2000 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -108,8 +108,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 }
 

diff --git a/tests/deal.II/create_laplace_matrix_04.cc b/tests/deal.II/create_laplace_matrix_04.cc
index 7e0daaa00ef90c96f28fae6494b91ebe8577383d..17516cca4967c8a7f2fb80bdadee2b00ef69fc6d 100644 (file)
--- a/tests/deal.II/create_laplace_matrix_04.cc
+++ b/tests/deal.II/create_laplace_matrix_04.cc
@@ -113,8 +113,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 
   deallog << "RHS vector: " << std::endl;

diff --git a/tests/deal.II/create_laplace_matrix_04b.cc b/tests/deal.II/create_laplace_matrix_04b.cc
index c100dd47aa7dddb9ca4b33303afb294b6784d955..e57a6e7cbf7c22bb6e1efe8d378e86a47c06fb70 100644 (file)
--- a/tests/deal.II/create_laplace_matrix_04b.cc
+++ b/tests/deal.II/create_laplace_matrix_04b.cc
@@ -111,8 +111,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 }
 

diff --git a/tests/deal.II/create_mass_matrix_01.cc b/tests/deal.II/create_mass_matrix_01.cc
index bb75e4ce1f3208d89e2ec072bca43ceb8ff8fdf1..c82fdd70265c4edf2bc098740163f8a0e28d7f9c 100644 (file)
--- a/tests/deal.II/create_mass_matrix_01.cc
+++ b/tests/deal.II/create_mass_matrix_01.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2000 - 2014 by the deal.II authors
+// Copyright (C) 2000 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -110,8 +110,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 
   deallog << "RHS vector: " << std::endl;

diff --git a/tests/deal.II/create_mass_matrix_01b.cc b/tests/deal.II/create_mass_matrix_01b.cc
index 55307c100fabd4b47ecaadde296f82fbacccb0b3..b192d55a12d7b86ff16769cbde25a8e051c29a57 100644 (file)
--- a/tests/deal.II/create_mass_matrix_01b.cc
+++ b/tests/deal.II/create_mass_matrix_01b.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2000 - 2014 by the deal.II authors
+// Copyright (C) 2000 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -106,8 +106,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 }
 

diff --git a/tests/deal.II/create_mass_matrix_02.cc b/tests/deal.II/create_mass_matrix_02.cc
index 47d703f7380be314559f9a2c5768ee439deab90d..efefd345b71aa928cb89d01ae86f00770673c920 100644 (file)
--- a/tests/deal.II/create_mass_matrix_02.cc
+++ b/tests/deal.II/create_mass_matrix_02.cc
@@ -113,8 +113,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 
   deallog << "RHS vector: " << std::endl;

diff --git a/tests/deal.II/create_mass_matrix_02b.cc b/tests/deal.II/create_mass_matrix_02b.cc
index d96db02531429f41a80a68b9e7f56fed9a72f1c6..af26e7ad83d511f772488353219280d89754ee95 100644 (file)
--- a/tests/deal.II/create_mass_matrix_02b.cc
+++ b/tests/deal.II/create_mass_matrix_02b.cc
@@ -109,8 +109,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 }
 

diff --git a/tests/deal.II/create_mass_matrix_03.cc b/tests/deal.II/create_mass_matrix_03.cc
index 504f135b415599739eeeb59cedd765b605452a50..0da851c92d9c924cd31e17ef3de1342146c3ac6b 100644 (file)
--- a/tests/deal.II/create_mass_matrix_03.cc
+++ b/tests/deal.II/create_mass_matrix_03.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2000 - 2014 by the deal.II authors
+// Copyright (C) 2000 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -110,8 +110,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 
   deallog << "RHS vector: " << std::endl;

diff --git a/tests/deal.II/create_mass_matrix_03b.cc b/tests/deal.II/create_mass_matrix_03b.cc
index a3037cbca893bd2c671c6e49f493578f646cfd92..6d85f7ecb5e04dd3cc106890f1d66d0477bf5024 100644 (file)
--- a/tests/deal.II/create_mass_matrix_03b.cc
+++ b/tests/deal.II/create_mass_matrix_03b.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2000 - 2014 by the deal.II authors
+// Copyright (C) 2000 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -108,8 +108,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 }
 

diff --git a/tests/deal.II/create_mass_matrix_04.cc b/tests/deal.II/create_mass_matrix_04.cc
index fb67861c64a0c874b6b8212ed40417fd06b9656a..2e5ff5a1a29d622d85daff8b1828bb41cf7addaa 100644 (file)
--- a/tests/deal.II/create_mass_matrix_04.cc
+++ b/tests/deal.II/create_mass_matrix_04.cc
@@ -113,8 +113,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 
   deallog << "RHS vector: " << std::endl;

diff --git a/tests/deal.II/create_mass_matrix_04b.cc b/tests/deal.II/create_mass_matrix_04b.cc
index 843f42b6ad5575e203571e702ac1e1b3e74a1db7..e89bec0bdb883face32e55002eddb9cf7c654609 100644 (file)
--- a/tests/deal.II/create_mass_matrix_04b.cc
+++ b/tests/deal.II/create_mass_matrix_04b.cc
@@ -111,8 +111,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 }
 

diff --git a/tests/deal.II/create_mass_matrix_05.cc b/tests/deal.II/create_mass_matrix_05.cc
index 95f5879d139aee3c4dd5b09ead4d8f1a058a68fd..d8be9589f6081054882deedf79a654339b8ec317 100644 (file)
--- a/tests/deal.II/create_mass_matrix_05.cc
+++ b/tests/deal.II/create_mass_matrix_05.cc
@@ -107,8 +107,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 }
 

diff --git a/tests/deal.II/matrices.cc b/tests/deal.II/matrices.cc
index 1839a1d5dfa86fe3a7c87905380e309b7d1b9269..02f2c8c4fff40e5aada428eb73da787df5945807 100644 (file)
--- a/tests/deal.II/matrices.cc
+++ b/tests/deal.II/matrices.cc
@@ -104,8 +104,7 @@ check_boundary (const DoFHandler<dim> &dof,
   // range of 1 or below,
   // multiply matrix by 100 to
   // make test more sensitive
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    matrix.global_entry(i) *= 100;
+  matrix *= 100;
 
   // finally write out matrix
   matrix.print (deallog.get_file_stream());
@@ -197,9 +196,10 @@ check ()
       // range of 1 or below,
       // multiply matrix by 100 to
       // make test more sensitive
-      for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-        deallog.get_file_stream() << matrix.global_entry(i) * 100
-                                  << std::endl;
+      for (SparseMatrix<double>::const_iterator p=matrix.begin();
+          p!=matrix.end(); ++p)
+       deallog.get_file_stream() << p->value() * 100
+                                 << std::endl;
     };
 
   if (dim > 1)

diff --git a/tests/fe/non_primitive_1.cc b/tests/fe/non_primitive_1.cc
index c35c1aabd33619ebb03c6ac63bf3ab3eb51b1246..93e8764ef595f4e2d56aadc6884dd7651cb75fd6 100644 (file)
--- a/tests/fe/non_primitive_1.cc
+++ b/tests/fe/non_primitive_1.cc
@@ -318,13 +318,16 @@ test ()
   // reduce the amount of data
   // written out a little bit, only
   // write every so-many-th element
-  for (unsigned int i=0; i<A1.n_nonzero_elements(); ++i)
+  SparseMatrix<double>::const_iterator p1 = A1.begin(),
+                                      p2 = A2.begin(),
+                                      p3 = A3.begin();
+  for (unsigned int i=0; i<A1.n_nonzero_elements(); ++i, ++p1, ++p2, ++p3)
     {
       if (i % (dim*dim*dim) == 0)
-        deallog << i << ' ' << A1.global_entry(i) << std::endl;
-      Assert (A1.global_entry(i) == A2.global_entry(i),
+        deallog << i << ' ' << p1->value() << std::endl;
+      Assert (p1->value() == p2->value(),
               ExcInternalError());
-      Assert (A1.global_entry(i) == A3.global_entry(i),
+      Assert (p1->value() == p3->value(),
               ExcInternalError());
     };
 }

diff --git a/tests/fe/non_primitive_2.cc b/tests/fe/non_primitive_2.cc
index 6fce78e0aafdbd5959083c1a919126bc6466af96..529611ec0a71c5b8205ceca65d3b960700086dcf 100644 (file)
--- a/tests/fe/non_primitive_2.cc
+++ b/tests/fe/non_primitive_2.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2001 - 2014 by the deal.II authors
+// Copyright (C) 2001 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -243,11 +243,13 @@ test (const unsigned int p)
   // reduce the amount of data
   // written out a little bit, only
   // write every so-many-th element
-  for (unsigned int i=0; i<A2.n_nonzero_elements(); ++i)
+  SparseMatrix<double>::const_iterator p2 = A2.begin(),
+                                      p3 = A3.begin();
+  for (unsigned int i=0; i<A2.n_nonzero_elements(); ++i, ++p2, ++p3)
     {
       if (i % (dim*dim*dim) == 0)
-        deallog << i << ' ' << A2.global_entry(i) << std::endl;
-      Assert (A3.global_entry(i) == A2.global_entry(i),
+        deallog << i << ' ' << p2->value() << std::endl;
+      Assert (p3->value() == p2->value(),
               ExcInternalError());
     };
 }

diff --git a/tests/hp/create_laplace_matrix_01.cc b/tests/hp/create_laplace_matrix_01.cc
index 52b77536a82f1956b0fe17ee52d81e124e7c2f97..9928b24a6761ea5f57396e1cdda94ef55e11b2cc 100644 (file)
--- a/tests/hp/create_laplace_matrix_01.cc
+++ b/tests/hp/create_laplace_matrix_01.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2000 - 2014 by the deal.II authors
+// Copyright (C) 2000 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -121,8 +121,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 
   deallog << "RHS vector: " << std::endl;

diff --git a/tests/hp/create_laplace_matrix_01b.cc b/tests/hp/create_laplace_matrix_01b.cc
index 4ef771843c7f4d178b5ac808206929b27b228751..5af25ce6eb52b9047e451bd516083b3306e2bb46 100644 (file)
--- a/tests/hp/create_laplace_matrix_01b.cc
+++ b/tests/hp/create_laplace_matrix_01b.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2000 - 2014 by the deal.II authors
+// Copyright (C) 2000 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -117,8 +117,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 }
 

diff --git a/tests/hp/create_laplace_matrix_02.cc b/tests/hp/create_laplace_matrix_02.cc
index f81d11f54f21db5f3e231d796cc36b14e1125190..dfdd758f311c84f3ae46ee3d98e974f0c8a7d70f 100644 (file)
--- a/tests/hp/create_laplace_matrix_02.cc
+++ b/tests/hp/create_laplace_matrix_02.cc
@@ -126,8 +126,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 
   deallog << "RHS vector: " << std::endl;

diff --git a/tests/hp/create_laplace_matrix_02b.cc b/tests/hp/create_laplace_matrix_02b.cc
index 332b0310a44b2fe320bdab916fa773a5735bdb1b..c485c5383a81f1c15cda44e978ca6fbc01003198 100644 (file)
--- a/tests/hp/create_laplace_matrix_02b.cc
+++ b/tests/hp/create_laplace_matrix_02b.cc
@@ -122,8 +122,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 }
 

diff --git a/tests/hp/create_laplace_matrix_03.cc b/tests/hp/create_laplace_matrix_03.cc
index abf207715f88ae8c8bf5c2019d14c3553e6b6cda..625ae6781e782996155afe05f69e6093ac58ee09 100644 (file)
--- a/tests/hp/create_laplace_matrix_03.cc
+++ b/tests/hp/create_laplace_matrix_03.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2000 - 2014 by the deal.II authors
+// Copyright (C) 2000 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -121,8 +121,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 
   deallog << "RHS vector: " << std::endl;

diff --git a/tests/hp/create_laplace_matrix_03b.cc b/tests/hp/create_laplace_matrix_03b.cc
index 218791ea8cd37b550c154639b71c6cd216a3103d..192d19d5d18dbfbafcf8695b30150ab1501765b5 100644 (file)
--- a/tests/hp/create_laplace_matrix_03b.cc
+++ b/tests/hp/create_laplace_matrix_03b.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2000 - 2014 by the deal.II authors
+// Copyright (C) 2000 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -119,8 +119,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 }
 

diff --git a/tests/hp/create_laplace_matrix_04.cc b/tests/hp/create_laplace_matrix_04.cc
index dbbda15615e91ef9c97fde2696f2cb2ff2a25639..a0b8e6107e1aedf29425af90ff84922407ec1ee2 100644 (file)
--- a/tests/hp/create_laplace_matrix_04.cc
+++ b/tests/hp/create_laplace_matrix_04.cc
@@ -126,8 +126,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 
   deallog << "RHS vector: " << std::endl;

diff --git a/tests/hp/create_laplace_matrix_04b.cc b/tests/hp/create_laplace_matrix_04b.cc
index e72d79da1a3b3b3868f1761fa13598725c207ded..ea70f64a43fc66d8caaf1afb3f02a807dfb64cc7 100644 (file)
--- a/tests/hp/create_laplace_matrix_04b.cc
+++ b/tests/hp/create_laplace_matrix_04b.cc
@@ -124,8 +124,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 }
 

diff --git a/tests/hp/create_mass_matrix_01.cc b/tests/hp/create_mass_matrix_01.cc
index 6161f19849e1e247cf7cebc30b29352068fce73a..4802a8fb575889f532326254310f8600e75705e2 100644 (file)
--- a/tests/hp/create_mass_matrix_01.cc
+++ b/tests/hp/create_mass_matrix_01.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2000 - 2014 by the deal.II authors
+// Copyright (C) 2000 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -121,8 +121,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 
   deallog << "RHS vector: " << std::endl;

diff --git a/tests/hp/create_mass_matrix_01b.cc b/tests/hp/create_mass_matrix_01b.cc
index 61071b5d236eb682926a619deefbcbc0abd56f8d..80ffaac79bc72f25824314fd82df9014a281997c 100644 (file)
--- a/tests/hp/create_mass_matrix_01b.cc
+++ b/tests/hp/create_mass_matrix_01b.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2000 - 2014 by the deal.II authors
+// Copyright (C) 2000 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -117,8 +117,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 }
 

diff --git a/tests/hp/create_mass_matrix_02.cc b/tests/hp/create_mass_matrix_02.cc
index d19d48831412aff406eade0dae893b67e6824da8..6347736d75bcee4a2af266b0a4d9671ce4dde9f6 100644 (file)
--- a/tests/hp/create_mass_matrix_02.cc
+++ b/tests/hp/create_mass_matrix_02.cc
@@ -126,8 +126,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 
   deallog << "RHS vector: " << std::endl;

diff --git a/tests/hp/create_mass_matrix_02b.cc b/tests/hp/create_mass_matrix_02b.cc
index e76b3fc1af1c55051b22ae3ab7bf664cfb982270..9579bded0fcf46eb73a8c91013ebdf71b915c21a 100644 (file)
--- a/tests/hp/create_mass_matrix_02b.cc
+++ b/tests/hp/create_mass_matrix_02b.cc
@@ -122,8 +122,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 }
 

diff --git a/tests/hp/create_mass_matrix_03.cc b/tests/hp/create_mass_matrix_03.cc
index 54a42425b85a4093228d592aefeab89362062277..0e44d6521664f7d45419e51c4a15d0d5a7e2377f 100644 (file)
--- a/tests/hp/create_mass_matrix_03.cc
+++ b/tests/hp/create_mass_matrix_03.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2000 - 2014 by the deal.II authors
+// Copyright (C) 2000 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -121,8 +121,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 
   deallog << "RHS vector: " << std::endl;

diff --git a/tests/hp/create_mass_matrix_03b.cc b/tests/hp/create_mass_matrix_03b.cc
index a2349e15c17437950f1bc99382d94c720670fb6a..bc2f5abac86ed23a8882015b1a6487a68effc2bd 100644 (file)
--- a/tests/hp/create_mass_matrix_03b.cc
+++ b/tests/hp/create_mass_matrix_03b.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2000 - 2014 by the deal.II authors
+// Copyright (C) 2000 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -121,8 +121,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 }
 

diff --git a/tests/hp/create_mass_matrix_04.cc b/tests/hp/create_mass_matrix_04.cc
index 71c61ba8f03bab94e4d1c9f00ee2ee5b253d1500..e298e05983a51f36cafb04aa19db3323e24129ac 100644 (file)
--- a/tests/hp/create_mass_matrix_04.cc
+++ b/tests/hp/create_mass_matrix_04.cc
@@ -126,8 +126,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 
   deallog << "RHS vector: " << std::endl;

diff --git a/tests/hp/create_mass_matrix_04b.cc b/tests/hp/create_mass_matrix_04b.cc
index d303ef158961ae6060c1c5dc3291ba61ec8745fe..7ba2b3e57c25001a4aceeed129dd75c2e7c692e1 100644 (file)
--- a/tests/hp/create_mass_matrix_04b.cc
+++ b/tests/hp/create_mass_matrix_04b.cc
@@ -124,8 +124,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 }
 

diff --git a/tests/hp/create_mass_matrix_05.cc b/tests/hp/create_mass_matrix_05.cc
index 280711c056c35280ef8cd46bf02bf80aa79341de..d6ea2a501191972a9dff31d0ca81df1271722ef5 100644 (file)
--- a/tests/hp/create_mass_matrix_05.cc
+++ b/tests/hp/create_mass_matrix_05.cc
@@ -122,8 +122,9 @@ check ()
   // multiply matrix by 100 to
   // make test more sensitive
   deallog << "Matrix: " << std::endl;
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    deallog << matrix.global_entry(i) * 100
+  for (SparseMatrix<double>::const_iterator p=matrix.begin();
+       p!=matrix.end(); ++p)
+    deallog << p->value() * 100
             << std::endl;
 }
 

diff --git a/tests/hp/matrices.cc b/tests/hp/matrices.cc
index fb9ca157d00d4f06778c9b8a19668ef3d8253801..1401daa1779bd0235e07f28e37f845d863f5e484 100644 (file)
--- a/tests/hp/matrices.cc
+++ b/tests/hp/matrices.cc
@@ -109,8 +109,7 @@ check_boundary (const hp::DoFHandler<dim> &dof,
   // range of 1 or below,
   // multiply matrix by 100 to
   // make test more sensitive
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    matrix.global_entry(i) *= 100;
+  matrix *= 100;
 
   // finally write out matrix
   matrix.print (deallog.get_file_stream());
@@ -206,9 +205,10 @@ check ()
       // range of 1 or below,
       // multiply matrix by 100 to
       // make test more sensitive
-      for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-        deallog.get_file_stream() << matrix.global_entry(i) * 100
-                                  << std::endl;
+      for (SparseMatrix<double>::const_iterator p=matrix.begin();
+          p!=matrix.end(); ++p)
+       deallog.get_file_stream() << p->value() * 100
+                                 << std::endl;
     };
 
   if (dim > 1)

diff --git a/tests/hp/matrices_hp.cc b/tests/hp/matrices_hp.cc
index f5cb7d1336966867aa3538c3281cadddfa43b0be..b9611a9cb3f23e963861c0754ddc9c9c840d416f 100644 (file)
--- a/tests/hp/matrices_hp.cc
+++ b/tests/hp/matrices_hp.cc
@@ -108,8 +108,7 @@ check_boundary (const hp::DoFHandler<dim> &dof,
   // range of 1 or below,
   // multiply matrix by 100 to
   // make test more sensitive
-  for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-    matrix.global_entry(i) *= 100;
+  matrix *= 100;
 
   // finally write out matrix
   matrix.print (deallog.get_file_stream());
@@ -212,9 +211,10 @@ check ()
       // range of 1 or below,
       // multiply matrix by 100 to
       // make test more sensitive
-      for (unsigned int i=0; i<matrix.n_nonzero_elements(); ++i)
-        deallog.get_file_stream() << matrix.global_entry(i) * 100
-                                  << std::endl;
+      for (SparseMatrix<double>::const_iterator p=matrix.begin();
+          p!=matrix.end(); ++p)
+       deallog.get_file_stream() << p->value() * 100
+                                 << std::endl;
     };
 
   if (dim > 1)

diff --git a/tests/lac/sparse_matrices.cc b/tests/lac/sparse_matrices.cc
index 98df20b6e1de0f183097cf7a5ed6b2edbe31af6a..b67f93911dbb16bd4041c3e89629ae03d0f7645e 100644 (file)
--- a/tests/lac/sparse_matrices.cc
+++ b/tests/lac/sparse_matrices.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 1998 - 2014 by the deal.II authors
+// Copyright (C) 1998 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -394,9 +394,11 @@ int main()
 
   std::remove ("sparse_matrices.tmp");
 
-  for (unsigned int i=0; i<A.n_nonzero_elements(); ++i)
-    if (std::fabs(A.global_entry(i) - A_tmp.global_entry(i)) <=
-        std::fabs(1e-14*A.global_entry(i)))
+  SparseMatrix<double>::const_iterator p    =A.begin(),
+                                      p_tmp=A_tmp.begin();
+  for (; p!=A.end(); ++p, ++p_tmp)
+    if (std::fabs(p->value() - p_tmp->value()) <=
+        std::fabs(1e-14*p->value()))
       deallog << "write/read-error at global position "
-              << i << std::endl;
+              << (p-A.begin()) << std::endl;
 }