From: heister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Fri, 1 Mar 2013 16:48:48 +0000 (+0000)
Subject: remove some deprecated stuff
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e08529b47a2617c6af998815c2036d0727fb218;p=dealii-svn.git

remove some deprecated stuff

git-svn-id: https://svn.dealii.org/trunk@28697 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/tests/mpi/step-40_direct_solver.cc b/tests/mpi/step-40_direct_solver.cc
index 1fd90be09e..e0293e5b1e 100644
--- a/tests/mpi/step-40_direct_solver.cc
+++ b/tests/mpi/step-40_direct_solver.cc
@@ -228,8 +228,8 @@ namespace Step40
                                                   system_rhs);
         }
 
-    system_matrix.compress ();
-    system_rhs.compress ();
+    system_matrix.compress (VectorOperation::add);
+    system_rhs.compress (VectorOperation::add);
   }
 
 
diff --git a/tests/mpi/trilinos_compress_bug.cc b/tests/mpi/trilinos_compress_bug.cc
index 6bd0c7ffd5..1201928894 100644
--- a/tests/mpi/trilinos_compress_bug.cc
+++ b/tests/mpi/trilinos_compress_bug.cc
@@ -56,7 +56,7 @@ void test ()
     }
   }
   
-  test1.compress(Add);
+  test1.compress(VectorOperation::add);
 
   //TrilinosWrappers::MPI::Vector test(test1.vector_partitioner()); // works
   //TrilinosWrappers::MPI::Vector test(locally_owned); // works
@@ -70,7 +70,7 @@ void test ()
   if (myid==0)
     deallog << "before compress: " << test(locally_owned.nth_index_in_set(5)) << endl;
       
-   test.compress(Insert);
+  test.compress(VectorOperation::insert);
   
   if (myid==0)
     deallog << "after compress: " << test(locally_owned.nth_index_in_set(5)) << endl;
diff --git a/tests/mpi/trilinos_ghost_05.cc b/tests/mpi/trilinos_ghost_05.cc
index 470c700eb3..90386fbcfc 100644
--- a/tests/mpi/trilinos_ghost_05.cc
+++ b/tests/mpi/trilinos_ghost_05.cc
@@ -59,7 +59,6 @@ void test ()
 
 				   // change x, transfer, and check again
   x*=2.0;
-  x.compress();
   v=x;
   
   Assert(v(myid*2) == myid*4.0, ExcInternalError());
diff --git a/tests/mpi/trilinos_matvec_01.cc b/tests/mpi/trilinos_matvec_01.cc
index 2cf80eb7c9..f1305de745 100644
--- a/tests/mpi/trilinos_matvec_01.cc
+++ b/tests/mpi/trilinos_matvec_01.cc
@@ -83,7 +83,7 @@ void test ()
     }
   if ((n_procs == 1) || (my_id == 1))
     A.add(2,3, 2.0);
-  A.compress();
+  A.compress(VectorOperation::add);
 
   TrilinosWrappers::MPI::Vector x, y;
   x.reinit (col_partitioning, MPI_COMM_WORLD);
diff --git a/tests/mpi/trilinos_matvec_02.cc b/tests/mpi/trilinos_matvec_02.cc
index 420913668b..b8d3e4b682 100644
--- a/tests/mpi/trilinos_matvec_02.cc
+++ b/tests/mpi/trilinos_matvec_02.cc
@@ -83,7 +83,7 @@ void test ()
     }
   if ((n_procs == 1) || (my_id == 1))
     A.add(2,3, 2.0);
-  A.compress();
+  A.compress(VectorOperation::add);
 
   TrilinosWrappers::MPI::Vector x, y;
   x.reinit (col_partitioning, MPI_COMM_WORLD);
diff --git a/tests/mpi/trilinos_sparse_matrix_mmult_01.cc b/tests/mpi/trilinos_sparse_matrix_mmult_01.cc
index 7a8bcc6117..e12ae39308 100644
--- a/tests/mpi/trilinos_sparse_matrix_mmult_01.cc
+++ b/tests/mpi/trilinos_sparse_matrix_mmult_01.cc
@@ -78,7 +78,7 @@ void test ()
   for (unsigned int i = 0; i<n_entries; ++i)
     if (row_partitioning.is_element(line[i]))
       A.add(line[i], local_index[i], local_value[i]);
-  A.compress();
+  A.compress(VectorOperation::add);
 
   if (my_id == 0)
     {
@@ -93,7 +93,6 @@ void test ()
 
   TrilinosWrappers::SparseMatrix AtA;
   A.Tmmult (AtA, A);
-  AtA.compress ();
 
 				   /* AtA should be
 
diff --git a/tests/mpi/trilinos_sparse_matrix_print_01.cc b/tests/mpi/trilinos_sparse_matrix_print_01.cc
index 51933e753e..d792ee630b 100644
--- a/tests/mpi/trilinos_sparse_matrix_print_01.cc
+++ b/tests/mpi/trilinos_sparse_matrix_print_01.cc
@@ -70,7 +70,7 @@ void test ()
   A.reinit (sp);
   if ((n_procs == 1) || (my_id == 1))
     A.add(2,3, 2.0);
-  A.compress();
+  A.compress(VectorOperation::add);
 
   if ((n_procs == 1) || (my_id == 1))
     A.print(deallog.get_file_stream());