From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Fri, 27 Feb 2015 19:55:27 +0000 (-0600)
Subject: Avoid calls to naked compress() without a VectorOperation argument.
X-Git-Tag: v8.3.0-rc1~380^2~11
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e6b820e03a94b848b23469d08ea83d0d8fc6648;p=dealii.git

Avoid calls to naked compress() without a VectorOperation argument.
---

diff --git a/tests/trilinos/01.cc b/tests/trilinos/01.cc
index bc4ac477e1..f2692c7c95 100644
--- a/tests/trilinos/01.cc
+++ b/tests/trilinos/01.cc
@@ -33,7 +33,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
       if ((i+2*j+1) % 3 == 0)
         m.set (i,j, i*j*.5+.5);
 
-  m.compress ();
+  m.compress (VectorOperation::insert);
 
   // then make sure we retrieve the same ones
   for (unsigned int i=0; i<m.m(); ++i)
diff --git a/tests/trilinos/02.cc b/tests/trilinos/02.cc
index e4f149b9eb..b655f87920 100644
--- a/tests/trilinos/02.cc
+++ b/tests/trilinos/02.cc
@@ -39,7 +39,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
       if ((i+2*j+1) % 3 == 0)
         m.add (i,j, i*j*.5+.5);
 
-  m.compress ();
+  m.compress (VectorOperation::add);
 
   // then make sure we retrieve the same ones
   for (unsigned int i=0; i<m.m(); ++i)
diff --git a/tests/trilinos/03a.cc b/tests/trilinos/03a.cc
index fc9c066cec..2fb3c42312 100644
--- a/tests/trilinos/03a.cc
+++ b/tests/trilinos/03a.cc
@@ -43,7 +43,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
       if ((i+2*j+1) % 3 == 0)
         m.add (i,j, i*j*.5+.5);
 
-  m.compress ();
+  m.compress (VectorOperation::add);
 
   // then make sure we retrieve the same ones
   for (unsigned int i=0; i<m.m(); ++i)
diff --git a/tests/trilinos/03b.cc b/tests/trilinos/03b.cc
index 89072fc0ee..cdb74ea0a9 100644
--- a/tests/trilinos/03b.cc
+++ b/tests/trilinos/03b.cc
@@ -42,7 +42,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
       if ((i+2*j+1) % 3 == 0)
         m.add (i,j, i*j*.5+.5);
 
-  m.compress();
+  m.compress(VectorOperation::add);
 
   // and overwrite everything again
   for (unsigned int i=0; i<m.m(); ++i)
@@ -50,7 +50,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
       if ((i+2*j+1) % 3 == 0)
         m.set (i,j, i*j*.5+.5);
 
-  m.compress ();
+  m.compress (VectorOperation::insert);
 
   // then make sure we retrieve the same ones
   for (unsigned int i=0; i<m.m(); ++i)
diff --git a/tests/trilinos/05.cc b/tests/trilinos/05.cc
index 52345a66fa..5e43cf4425 100644
--- a/tests/trilinos/05.cc
+++ b/tests/trilinos/05.cc
@@ -38,7 +38,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
           ++counter;
         }
 
-  m.compress ();
+  m.compress (VectorOperation::insert);
 
   deallog << m.n_nonzero_elements() << std::endl;
   Assert (m.n_nonzero_elements() == counter,
diff --git a/tests/trilinos/06.cc b/tests/trilinos/06.cc
index bb39bb4f5d..1539153711 100644
--- a/tests/trilinos/06.cc
+++ b/tests/trilinos/06.cc
@@ -33,7 +33,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
       if ((i+2*j+1) % 3 == 0)
         m.set (i,j, i*j*.5+.5);
 
-  m.compress ();
+  m.compress (VectorOperation::insert);
 
   // compare against the exact value of the
   // l1-norm (max col-sum)
diff --git a/tests/trilinos/07.cc b/tests/trilinos/07.cc
index 4aeb526b6a..051f8456ed 100644
--- a/tests/trilinos/07.cc
+++ b/tests/trilinos/07.cc
@@ -33,7 +33,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
       if ((i+2*j+1) % 3 == 0)
         m.set (i,j, i*j*.5+.5);
 
-  m.compress ();
+  m.compress (VectorOperation::insert);
 
   // compare against the exact value of the
   // linfty-norm (max row-sum)
diff --git a/tests/trilinos/08.cc b/tests/trilinos/08.cc
index 36fbcf8e41..ede3154347 100644
--- a/tests/trilinos/08.cc
+++ b/tests/trilinos/08.cc
@@ -38,7 +38,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
         }
   norm = std::sqrt(norm);
 
-  m.compress ();
+  m.compress (VectorOperation::insert);
 
   // compare against the exact value of the
   // l2-norm (max row-sum)
diff --git a/tests/trilinos/09.cc b/tests/trilinos/09.cc
index 37090475f8..17c4905054 100644
--- a/tests/trilinos/09.cc
+++ b/tests/trilinos/09.cc
@@ -32,7 +32,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
       if ((i+2*j+1) % 3 == 0)
         m.set (i,j, i*j*.5+.5);
 
-  m.compress ();
+  m.compress (VectorOperation::insert);
 
   // then multiply everything by 1.25 and
   // make sure we retrieve the values we
diff --git a/tests/trilinos/10.cc b/tests/trilinos/10.cc
index 4dc8a0fa85..5f1eaef274 100644
--- a/tests/trilinos/10.cc
+++ b/tests/trilinos/10.cc
@@ -32,7 +32,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
       if ((i+2*j+1) % 3 == 0)
         m.set (i,j, i*j*.5+.5);
 
-  m.compress ();
+  m.compress (VectorOperation::insert);
 
   // then divide everything by 4/3 and
   // make sure we retrieve the values we
diff --git a/tests/trilinos/52.cc b/tests/trilinos/52.cc
index 5b105b0f39..40c7a4b1bf 100644
--- a/tests/trilinos/52.cc
+++ b/tests/trilinos/52.cc
@@ -34,7 +34,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
       if ((i+2*j+1) % 3 == 0)
         m.set (i,j, i*j*.5+.5);
 
-  m.compress ();
+  m.compress (VectorOperation::insert);
 
   // then make sure we retrieve the same ones
   for (unsigned int i=0; i<m.m(); ++i)
diff --git a/tests/trilinos/64.cc b/tests/trilinos/64.cc
index 9ccd8f2ba5..fca507bfd3 100644
--- a/tests/trilinos/64.cc
+++ b/tests/trilinos/64.cc
@@ -34,9 +34,9 @@ template<typename MatrixType>
 void test (MatrixType &m)
 {
   m.set(0,0,1.);
-  m.compress();
+  m.compress(VectorOperation::insert);
   m = 0;
-  m.compress();
+  m.compress(VectorOperation::insert);
 
   Assert(fabs(m.frobenius_norm())<1e-15, ExcInternalError());
 
diff --git a/tests/trilinos/add_matrices_06.cc b/tests/trilinos/add_matrices_06.cc
index 93ed824bd3..7e16b9bc79 100644
--- a/tests/trilinos/add_matrices_06.cc
+++ b/tests/trilinos/add_matrices_06.cc
@@ -42,9 +42,9 @@ void test (TrilinosWrappers::SparseMatrix &m)
           m3.set (i,j, -0.1);
         }
 
-  m.compress ();
-  m2.compress();
-  m3.compress();
+  m.compress (VectorOperation::insert);
+  m2.compress(VectorOperation::insert);
+  m3.compress(VectorOperation::insert);
 
   deallog << "Matrix nonzeros: " << m.n_nonzero_elements() <<  " "
           << m2.n_nonzero_elements() <<  " "
diff --git a/tests/trilinos/block_sparse_matrix_add_01.cc b/tests/trilinos/block_sparse_matrix_add_01.cc
index 8bd7aac4dc..5f3a33422c 100644
--- a/tests/trilinos/block_sparse_matrix_add_01.cc
+++ b/tests/trilinos/block_sparse_matrix_add_01.cc
@@ -50,7 +50,7 @@ void test ()
 
           m_small.set (i,j, value);
         }
-  m_small.compress();
+  m_small.compress(VectorOperation::insert);
 
   // Then build two matrices consisting of
   // several copies of the small
@@ -105,7 +105,7 @@ void test ()
       }
   }
 
-  m2.compress();
+  m2.compress(VectorOperation::add);
 
   // subtract the matrix m from this one,
   // we should get a zero matrix
diff --git a/tests/trilinos/block_sparse_matrix_set_01.cc b/tests/trilinos/block_sparse_matrix_set_01.cc
index 68097c2f32..ea13559af1 100644
--- a/tests/trilinos/block_sparse_matrix_set_01.cc
+++ b/tests/trilinos/block_sparse_matrix_set_01.cc
@@ -51,7 +51,7 @@ void test ()
 
           m_small.set (i,j, value);
         }
-  m_small.compress();
+  m_small.compress(VectorOperation::insert);
 
   // Then build two matrices consisting of
   // several copies of the small
@@ -106,7 +106,7 @@ void test ()
       }
   }
 
-  m2.compress();
+  m2.compress(VectorOperation::insert);
 
   // subtract the matrix m from this one,
   // we should get a zero matrix
diff --git a/tests/trilinos/deal_solver_01.cc b/tests/trilinos/deal_solver_01.cc
index 14c36b4b7c..495b362bdc 100644
--- a/tests/trilinos/deal_solver_01.cc
+++ b/tests/trilinos/deal_solver_01.cc
@@ -93,7 +93,7 @@ int main(int argc, char **argv)
     TrilinosWrappers::Vector  f(dim);
     TrilinosWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
+    A.compress (VectorOperation::insert);
     f.compress (VectorOperation::insert);
     u.compress (VectorOperation::insert);
 
diff --git a/tests/trilinos/deal_solver_02.cc b/tests/trilinos/deal_solver_02.cc
index 21b3c5d5ea..c9ce657557 100644
--- a/tests/trilinos/deal_solver_02.cc
+++ b/tests/trilinos/deal_solver_02.cc
@@ -94,7 +94,7 @@ int main(int argc, char **argv)
     TrilinosWrappers::Vector  f(dim);
     TrilinosWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
+    A.compress (VectorOperation::insert);
     f.compress (VectorOperation::insert);
     u.compress (VectorOperation::insert);
 
diff --git a/tests/trilinos/deal_solver_03.cc b/tests/trilinos/deal_solver_03.cc
index 394a9489f2..031d63da45 100644
--- a/tests/trilinos/deal_solver_03.cc
+++ b/tests/trilinos/deal_solver_03.cc
@@ -95,7 +95,7 @@ int main(int argc, char **argv)
     TrilinosWrappers::Vector  f(dim);
     TrilinosWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
+    A.compress (VectorOperation::insert);
     f.compress (VectorOperation::insert);
     u.compress (VectorOperation::insert);
 
diff --git a/tests/trilinos/deal_solver_04.cc b/tests/trilinos/deal_solver_04.cc
index 87ee004693..acb9625aa0 100644
--- a/tests/trilinos/deal_solver_04.cc
+++ b/tests/trilinos/deal_solver_04.cc
@@ -94,7 +94,7 @@ int main(int argc, char **argv)
     TrilinosWrappers::Vector  f(dim);
     TrilinosWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
+    A.compress (VectorOperation::insert);
     f.compress (VectorOperation::insert);
     u.compress (VectorOperation::insert);
 
diff --git a/tests/trilinos/deal_solver_05.cc b/tests/trilinos/deal_solver_05.cc
index a34b93bf98..902311ecc0 100644
--- a/tests/trilinos/deal_solver_05.cc
+++ b/tests/trilinos/deal_solver_05.cc
@@ -93,7 +93,7 @@ int main(int argc, char **argv)
     TrilinosWrappers::Vector  f(dim);
     TrilinosWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
+    A.compress (VectorOperation::insert);
     f.compress (VectorOperation::insert);
     u.compress (VectorOperation::insert);
 
diff --git a/tests/trilinos/deal_solver_06.cc b/tests/trilinos/deal_solver_06.cc
index 312b6bc111..502361e1ba 100644
--- a/tests/trilinos/deal_solver_06.cc
+++ b/tests/trilinos/deal_solver_06.cc
@@ -91,7 +91,7 @@ int main(int argc, char **argv)
     TrilinosWrappers::Vector  f(dim);
     TrilinosWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
+    A.compress (VectorOperation::insert);
     f.compress (VectorOperation::insert);
     u.compress (VectorOperation::insert);
 
diff --git a/tests/trilinos/parallel_sparse_matrix_01.cc b/tests/trilinos/parallel_sparse_matrix_01.cc
index 5937d8c726..d7b03b6bd5 100644
--- a/tests/trilinos/parallel_sparse_matrix_01.cc
+++ b/tests/trilinos/parallel_sparse_matrix_01.cc
@@ -97,7 +97,7 @@ void test ()
     for (unsigned int j=0; j<csp.row_length(i); ++j)
       m.add (i, csp.column_number(i,j), 1.);
 
-  m.compress ();
+  m.compress (VectorOperation::add);
 
   deallog << "OK" << std::endl;
 }
diff --git a/tests/trilinos/slowness_02.cc b/tests/trilinos/slowness_02.cc
index 7efba915c0..01ef332125 100644
--- a/tests/trilinos/slowness_02.cc
+++ b/tests/trilinos/slowness_02.cc
@@ -63,7 +63,7 @@ void test ()
             matrix.set(global, global+N, -1);
           }
       }
-  matrix.compress ();
+  matrix.compress (VectorOperation::insert);
 
 
   // then do a single matrix-vector
diff --git a/tests/trilinos/slowness_03.cc b/tests/trilinos/slowness_03.cc
index 6afbf1ce37..ebe2d928c8 100644
--- a/tests/trilinos/slowness_03.cc
+++ b/tests/trilinos/slowness_03.cc
@@ -65,7 +65,7 @@ void test ()
             matrix.set(global, global+N, -1);
           }
       }
-  matrix.compress ();
+  matrix.compress (VectorOperation::insert);
 
   // then do a single matrix-vector
   // multiplication with subsequent formation
diff --git a/tests/trilinos/solver_03.cc b/tests/trilinos/solver_03.cc
index d73e57fcca..f2c2004298 100644
--- a/tests/trilinos/solver_03.cc
+++ b/tests/trilinos/solver_03.cc
@@ -88,7 +88,7 @@ int main(int argc, char **argv)
     TrilinosWrappers::Vector  f(dim);
     TrilinosWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
+    A.compress (VectorOperation::insert);
     f.compress (VectorOperation::insert);
     u.compress (VectorOperation::insert);
 
diff --git a/tests/trilinos/solver_05.cc b/tests/trilinos/solver_05.cc
index b47004759b..4c9e437907 100644
--- a/tests/trilinos/solver_05.cc
+++ b/tests/trilinos/solver_05.cc
@@ -88,7 +88,7 @@ int main(int argc, char **argv)
     TrilinosWrappers::Vector  f(dim);
     TrilinosWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
+    A.compress (VectorOperation::insert);
     f.compress (VectorOperation::insert);
     u.compress (VectorOperation::insert);
 
diff --git a/tests/trilinos/solver_07.cc b/tests/trilinos/solver_07.cc
index 7a746bc016..2aad2f3e5d 100644
--- a/tests/trilinos/solver_07.cc
+++ b/tests/trilinos/solver_07.cc
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
     TrilinosWrappers::Vector  f(dim);
     TrilinosWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
+    A.compress (VectorOperation::insert);
     f.compress (VectorOperation::insert);
     u.compress (VectorOperation::insert);
 
diff --git a/tests/trilinos/sparse_matrix_01.cc b/tests/trilinos/sparse_matrix_01.cc
index d11293884a..9d5ff4d9fc 100644
--- a/tests/trilinos/sparse_matrix_01.cc
+++ b/tests/trilinos/sparse_matrix_01.cc
@@ -52,7 +52,7 @@ int main (int argc,char **argv)
 
   TrilinosWrappers::SparseMatrix A (sp);
   A.add (2, 3, 2.0);
-  A.compress();
+  A.compress(VectorOperation::add);
 
   // verify that entry (2,3) is
   // indeed what we expect. verify
diff --git a/tests/trilinos/sparse_matrix_add_01.cc b/tests/trilinos/sparse_matrix_add_01.cc
index 273ccf4b7c..06cdf21457 100644
--- a/tests/trilinos/sparse_matrix_add_01.cc
+++ b/tests/trilinos/sparse_matrix_add_01.cc
@@ -38,8 +38,8 @@ void test (TrilinosWrappers::SparseMatrix &m)
           m2.set (i,j, 0.);
         }
 
-  m.compress ();
-  m2.compress();
+  m.compress (VectorOperation::insert);
+  m2.compress(VectorOperation::insert);
 
   // now add the same elements row-wise
   {
@@ -71,7 +71,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
       }
   }
 
-  m2.compress();
+  m2.compress(VectorOperation::add);
 
   // subtract the matrix m from this one,
   // we should get a zero matrix
diff --git a/tests/trilinos/sparse_matrix_add_02.cc b/tests/trilinos/sparse_matrix_add_02.cc
index dd559cb089..90a738b1b6 100644
--- a/tests/trilinos/sparse_matrix_add_02.cc
+++ b/tests/trilinos/sparse_matrix_add_02.cc
@@ -51,8 +51,8 @@ void test (TrilinosWrappers::SparseMatrix &m)
           m2.set (i,j, 0.);
         }
 
-  m.compress ();
-  m2.compress();
+  m.compress (VectorOperation::insert);
+  m2.compress(VectorOperation::insert);
 
   // now add the same elements from a full
   // matrix
@@ -71,7 +71,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
       }
   }
 
-  m2.compress();
+  m2.compress(VectorOperation::add);
 
   // subtract the matrix m from this one,
   // we should get a zero matrix
diff --git a/tests/trilinos/sparse_matrix_iterator_01.cc b/tests/trilinos/sparse_matrix_iterator_01.cc
index 1bb0902439..2eb1d628de 100644
--- a/tests/trilinos/sparse_matrix_iterator_01.cc
+++ b/tests/trilinos/sparse_matrix_iterator_01.cc
@@ -30,7 +30,7 @@ void test ()
   m.set (0,0,1);
   m.set (1,1,2);
   m.set (1,2,3);
-  m.compress ();
+  m.compress (VectorOperation::insert);
   TrilinosWrappers::SparseMatrix::const_iterator i = m.begin();
   deallog << i->row() << ' ' << i->column() << ' ' << i->value() << std::endl;
   ++i;
diff --git a/tests/trilinos/sparse_matrix_set_01.cc b/tests/trilinos/sparse_matrix_set_01.cc
index 039e302908..8824c12333 100644
--- a/tests/trilinos/sparse_matrix_set_01.cc
+++ b/tests/trilinos/sparse_matrix_set_01.cc
@@ -33,7 +33,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
       if ((i+2*j+1) % 3 == 0)
         m.set (i,j, i*j*.5+.5);
 
-  m.compress ();
+  m.compress (VectorOperation::insert);
 
   TrilinosWrappers::SparseMatrix m2(m.m(), m.n(), m.n()/3+1);
 
@@ -67,7 +67,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
       }
   }
 
-  m2.compress();
+  m2.compress(VectorOperation::insert);
 
   // subtract the matrix m from this one,
   // we should get a zero matrix.
diff --git a/tests/trilinos/sparse_matrix_set_02.cc b/tests/trilinos/sparse_matrix_set_02.cc
index 49254ee693..c0146fa529 100644
--- a/tests/trilinos/sparse_matrix_set_02.cc
+++ b/tests/trilinos/sparse_matrix_set_02.cc
@@ -49,7 +49,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
 
           m.set (i,j, value);
         }
-  m.compress ();
+  m.compress (VectorOperation::insert);
   // now add the same elements from a full
   // matrix (if the same element is set
   // more than once, Trilinos adds them)
@@ -68,7 +68,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
       }
   }
 
-  m2.compress();
+  m2.compress(VectorOperation::insert);
 
   // subtract the matrix m from this one,
   // we should get a zero matrix