Explicitly compress petsc objects with a VectorOperation.

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

diff --git a/tests/petsc/01.cc b/tests/petsc/01.cc
index 5f3cc2ad78e467f1dcf65fae0c4d9619abe42c41..bd4a6924627f05b83c3dac58ff17aa631ae37ad3 100644 (file)
--- a/tests/petsc/01.cc
+++ b/tests/petsc/01.cc
@@ -33,7 +33,7 @@ void test (PETScWrappers::SparseMatrix &m)
       if ((i+2*j+1) % 3 == 0)
         m.set (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/petsc/02.cc b/tests/petsc/02.cc
index 2dbcbcdb3b7bb4a163b6f67553dd9116e7164d16..e82287068049935e7c768095f20e0ced5d2e9d3b 100644 (file)
--- a/tests/petsc/02.cc
+++ b/tests/petsc/02.cc
@@ -33,7 +33,7 @@ void test (PETScWrappers::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/petsc/05.cc b/tests/petsc/05.cc
index 3991d6ecb0f665b46aa697b24aa88858c3512cea..da9d16bc4de46cb9086af4dfd1801514a4ae3f80 100644 (file)
--- a/tests/petsc/05.cc
+++ b/tests/petsc/05.cc
@@ -38,7 +38,7 @@ void test (PETScWrappers::SparseMatrix &m)
           ++counter;
         }
 
-  m.compress ();
+  m.compress VectorOperation::add();
 
   deallog << m.n_nonzero_elements() << std::endl;
   Assert (m.n_nonzero_elements() == counter,

diff --git a/tests/petsc/06.cc b/tests/petsc/06.cc
index 3cf3ad8b11c598dc2c6db23ab31007c49e8b3b18..077103411b49ceeb543a6e5181f9ac110286d8fe 100644 (file)
--- a/tests/petsc/06.cc
+++ b/tests/petsc/06.cc
@@ -33,7 +33,7 @@ void test (PETScWrappers::SparseMatrix &m)
       if ((i+2*j+1) % 3 == 0)
         m.set (i,j, i*j*.5+.5);
 
-  m.compress ();
+  m.compress (VectorOperation::add);
 
   // compare against the exact value of the
   // l1-norm (max col-sum)

diff --git a/tests/petsc/07.cc b/tests/petsc/07.cc
index c0bbc2a97b08ef466226d39a43b8df00f2d3912c..e9f764976976ca666c934ad65e30907e06c86e9b 100644 (file)
--- a/tests/petsc/07.cc
+++ b/tests/petsc/07.cc
@@ -33,7 +33,7 @@ void test (PETScWrappers::SparseMatrix &m)
       if ((i+2*j+1) % 3 == 0)
         m.set (i,j, i*j*.5+.5);
 
-  m.compress ();
+  m.compress (VectorOperation::add);
 
   // compare against the exact value of the
   // linfty-norm (max row-sum)

diff --git a/tests/petsc/08.cc b/tests/petsc/08.cc
index 5a637d9bb330508cd18ecef1f286344ea6cec27c..540d479b7dc93362ad9105a9380e11e325302cce 100644 (file)
--- a/tests/petsc/08.cc
+++ b/tests/petsc/08.cc
@@ -38,7 +38,7 @@ void test (PETScWrappers::SparseMatrix &m)
         }
   norm = std::sqrt(norm);
 
-  m.compress ();
+  m.compress (VectorOperation::add);
 
   // compare against the exact value of the
   // l2-norm (max row-sum)

diff --git a/tests/petsc/09.cc b/tests/petsc/09.cc
index 15050cd79539d006ed5f4013b24b950982310307..e7e32c34183529dd7d9dd790e13abe8323ac742b 100644 (file)
--- a/tests/petsc/09.cc
+++ b/tests/petsc/09.cc
@@ -32,7 +32,7 @@ void test (PETScWrappers::SparseMatrix &m)
       if ((i+2*j+1) % 3 == 0)
         m.set (i,j, i*j*.5+.5);
 
-  m.compress ();
+  m.compress (VectorOperation::add);
 
   // then multiply everything by 1.25 and
   // make sure we retrieve the values we

diff --git a/tests/petsc/10.cc b/tests/petsc/10.cc
index ee2dab657fd0769ed308ba7fed1f8291cf198787..3c1b7556b465e2abe21c172c31ec05345ff7d2e8 100644 (file)
--- a/tests/petsc/10.cc
+++ b/tests/petsc/10.cc
@@ -32,7 +32,7 @@ void test (PETScWrappers::SparseMatrix &m)
       if ((i+2*j+1) % 3 == 0)
         m.set (i,j, i*j*.5+.5);
 
-  m.compress ();
+  m.compress (VectorOperation::add);
 
   // then divide everything by 4/3 and
   // make sure we retrieve the values we

diff --git a/tests/petsc/11.cc b/tests/petsc/11.cc
index 9f99bdba542d8b06eddd1fc6febf65d0dcd0489a..cc7213f923e0d3dd977f93f333cf12963d8ee360 100644 (file)
--- a/tests/petsc/11.cc
+++ b/tests/petsc/11.cc
@@ -30,7 +30,7 @@ void test (PETScWrappers::Vector &v)
   for (unsigned int i=0; i<v.size(); i+=1+i)
     v(i) = i;
 
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   Assert (v.size() == 100, ExcInternalError());
 

diff --git a/tests/petsc/12.cc b/tests/petsc/12.cc
index a9954b0a8b0f5065e1d7b94c39a6bdadc4a7b9b7..4e38d87fac9b0add69de47162da8e2e647254fed 100644 (file)
--- a/tests/petsc/12.cc
+++ b/tests/petsc/12.cc
@@ -37,7 +37,7 @@ void test (PETScWrappers::Vector &v)
       pattern[i] = true;
     }
 
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   // check that they are ok, and this time
   // all of them

diff --git a/tests/petsc/13.cc b/tests/petsc/13.cc
index 44be821ae33e87eb2f06e56b9c82adc3402a34f8..ddc9632996ebb35feb59a0d2197ee5d99692bedb 100644 (file)
--- a/tests/petsc/13.cc
+++ b/tests/petsc/13.cc
@@ -37,7 +37,7 @@ void test (PETScWrappers::Vector &v)
       pattern[i] = true;
     }
 
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   // check that they are ok, and this time
   // all of them

diff --git a/tests/petsc/17.cc b/tests/petsc/17.cc
index 9501b1f042354759df83e13588afc135b5f73e86..cfb680d6cf01f9d23de1139fd389a8582b24bf3c 100644 (file)
--- a/tests/petsc/17.cc
+++ b/tests/petsc/17.cc
@@ -34,7 +34,7 @@ void test (PETScWrappers::Vector &v)
       v(i) = i;
       norm += std::fabs(1.*i);
     }
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   // then check the norm
   Assert (v.l1_norm() == norm, ExcInternalError());

diff --git a/tests/petsc/18.cc b/tests/petsc/18.cc
index 3e3537cf30adad8d4be023c7de2c67a3286bda20..6175fc23f118dc9cc65d6f9bcc64700665621529 100644 (file)
--- a/tests/petsc/18.cc
+++ b/tests/petsc/18.cc
@@ -34,7 +34,7 @@ void test (PETScWrappers::Vector &v)
       v(i) = i;
       norm += std::fabs(1.*i)*std::fabs(1.*i);
     }
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   // then check the norm
   const double eps=typeid(PetscScalar)==typeid(double) ? 1e-14 : 1e-5;

diff --git a/tests/petsc/19.cc b/tests/petsc/19.cc
index 6de9a94180aa02694076b250b5ac1de1ca10f67b..7c5e074010c195626719dc170a09fa403b161ccb 100644 (file)
--- a/tests/petsc/19.cc
+++ b/tests/petsc/19.cc
@@ -34,7 +34,7 @@ void test (PETScWrappers::Vector &v)
       v(i) = i;
       norm = std::max(norm,fabs(i));
     }
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   // then check the norm
   Assert (v.linfty_norm() == norm, ExcInternalError());

diff --git a/tests/petsc/20.cc b/tests/petsc/20.cc
index aa303d23af48174c0974573c25cba5b379ea4845..20bd818bad7020157ed42e63018b04802075fed9 100644 (file)
--- a/tests/petsc/20.cc
+++ b/tests/petsc/20.cc
@@ -36,7 +36,7 @@ void test (PETScWrappers::Vector &v)
       v(i) = i;
       pattern[i] = true;
     }
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   // multiply v with 5/4
   v *= 5./4.;

diff --git a/tests/petsc/21.cc b/tests/petsc/21.cc
index 4b3602598b54049f01e0ee95215755d1549240e8..9c0f7c134f9385b28c662bec73f35f8e6bd8e9d9 100644 (file)
--- a/tests/petsc/21.cc
+++ b/tests/petsc/21.cc
@@ -36,7 +36,7 @@ void test (PETScWrappers::Vector &v)
       v(i) = i;
       pattern[i] = true;
     }
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   // multiply v with 3/4
   v /= 4./3.;

diff --git a/tests/petsc/22.cc b/tests/petsc/22.cc
index 593c88d366a8a0178c8f00eae6aee5c2165e6850..4816c9fc8dc5bf0ec80b0c9fbf7f409cc9938d4f 100644 (file)
--- a/tests/petsc/22.cc
+++ b/tests/petsc/22.cc
@@ -36,8 +36,8 @@ void test (PETScWrappers::Vector &v,
       v(i) = i;
     else
       w(i) = i;
-  v.compress ();
-  w.compress ();
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
 
   // make sure the scalar product is zero
   Assert (v*w == 0, ExcInternalError());

diff --git a/tests/petsc/23.cc b/tests/petsc/23.cc
index 747ba74d3e7f0cec213ee6fb429e0c6fadd835f8..e277aae4f927375f99db0696a7b546d4341a8038 100644 (file)
--- a/tests/petsc/23.cc
+++ b/tests/petsc/23.cc
@@ -43,8 +43,8 @@ void test (PETScWrappers::Vector &v,
         }
     }
 
-  v.compress ();
-  w.compress ();
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
 
   // make sure the scalar product is zero
   Assert (v*w == product, ExcInternalError());

diff --git a/tests/petsc/24.cc b/tests/petsc/24.cc
index dae86a02b1875950c7c6a848a442ab070ab95db3..837357831bc40a094c4d4971ef30b2ce19e34919 100644 (file)
--- a/tests/petsc/24.cc
+++ b/tests/petsc/24.cc
@@ -33,7 +33,7 @@ void test (PETScWrappers::Vector &v)
   for (unsigned int i=0; i<v.size(); ++i)
     if (i%3 == 0)
       v(i) = i+1.;
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   // then clear it again and make sure the
   // vector is really empty

diff --git a/tests/petsc/25.cc b/tests/petsc/25.cc
index 82a30e4adb54d7e9904f1d98cbde23bda3a60375..ee73c55135107406a4ad17aec622ca6a707eca2c 100644 (file)
--- a/tests/petsc/25.cc
+++ b/tests/petsc/25.cc
@@ -31,7 +31,7 @@ void test (PETScWrappers::Vector &v)
   for (unsigned int i=0; i<v.size(); ++i)
     if (i%3 == 0)
       v(i) = i+1.;
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   // then clear it again and make sure the
   // vector is really empty

diff --git a/tests/petsc/26.cc b/tests/petsc/26.cc
index 2a26dfea28857842f6b809b3316269ed06407b45..e592f2b41f76f1cd849c13b71d417b446618de72 100644 (file)
--- a/tests/petsc/26.cc
+++ b/tests/petsc/26.cc
@@ -32,7 +32,7 @@ void test (PETScWrappers::Vector &v)
   for (unsigned int i=0; i<v.size(); ++i)
     if (i%3 == 0)
       v(i) = i+1.;
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   const unsigned int sz = v.size();
   v = 2;

diff --git a/tests/petsc/27.cc b/tests/petsc/27.cc
index ea407ff9385be3c4a3c9196bbea6aca0c451fdb8..a1bc82eaebae9cc336994f8385f2863bb0db678a 100644 (file)
--- a/tests/petsc/27.cc
+++ b/tests/petsc/27.cc
@@ -31,7 +31,7 @@ void test (PETScWrappers::Vector &v)
   for (unsigned int i=0; i<v.size(); ++i)
     if (i%3 == 0)
       v(i) = i+1.;
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   // then copy it
   PETScWrappers::Vector w (v.size());

diff --git a/tests/petsc/28.cc b/tests/petsc/28.cc
index 278eb8fdfc2adbea65662ec60392490f336fc27b..50ba45f847af5bb3f45584198c014f8456033a5c 100644 (file)
--- a/tests/petsc/28.cc
+++ b/tests/petsc/28.cc
@@ -32,7 +32,7 @@ void test (PETScWrappers::Vector &v)
   for (unsigned int i=0; i<v.size(); ++i)
     if (i%3 == 0)
       v(i) = i+1.;
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   // then copy it to a vector of different
   // size

diff --git a/tests/petsc/30.cc b/tests/petsc/30.cc
index 368a4d9194570aba78ee46424f76f43c03399831..1bbe5efea48b9cf15bf4bf0edb846c7cd3739a57 100644 (file)
--- a/tests/petsc/30.cc
+++ b/tests/petsc/30.cc
@@ -31,7 +31,7 @@ void test (PETScWrappers::Vector &v)
   for (unsigned int i=0; i<v.size(); ++i)
     if (i%3 == 0)
       v(i) = i+1.;
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   // then resize with setting to zero
   v.reinit (13, false);

diff --git a/tests/petsc/31.cc b/tests/petsc/31.cc
index 725303a2d008764195b963ba6cd0cbf552d1a5f3..276705a643e384ee412f953777fe5445514f04ef 100644 (file)
--- a/tests/petsc/31.cc
+++ b/tests/petsc/31.cc
@@ -34,7 +34,7 @@ void test (PETScWrappers::Vector &v)
       v(i) = i;
       norm += std::fabs(1.*i)*std::fabs(1.*i);
     }
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   // then check the norm
   const double eps=typeid(PetscScalar)==typeid(double) ? 1e-14 : 1e-5;

diff --git a/tests/petsc/32.cc b/tests/petsc/32.cc
index 1136971c1ff21bb8cbc7a9bf0b612345620d5f2b..aada706965d1dd721f941540eedacfbfd55d63af 100644 (file)
--- a/tests/petsc/32.cc
+++ b/tests/petsc/32.cc
@@ -34,7 +34,7 @@ void test (PETScWrappers::Vector &v)
       v(i) = i;
       sum += i;
     }
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   // then check the norm
   const double eps=typeid(PetscScalar)==typeid(double) ? 1e-14 : 1e-5;

diff --git a/tests/petsc/33.cc b/tests/petsc/33.cc
index 7cdf00cdb28187d645a3967982009e0e19e12e2c..17fae3e66029d68adc8db43173dac86d5adc5c55 100644 (file)
--- a/tests/petsc/33.cc
+++ b/tests/petsc/33.cc
@@ -34,7 +34,7 @@ void test (PETScWrappers::Vector &v)
       v(i) = i;
       sum += i*i*i;
     }
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   // then check the norm
   const double eps=typeid(PetscScalar)==typeid(double) ? 1e-14 : 1e-5;

diff --git a/tests/petsc/34.cc b/tests/petsc/34.cc
index d2ce01c600ce4539aa69d02d493d847e1843663d..bc5ee0609c0c9145af8820e379bca083dae2f1c7 100644 (file)
--- a/tests/petsc/34.cc
+++ b/tests/petsc/34.cc
@@ -34,7 +34,7 @@ void test (PETScWrappers::Vector &v)
       v(i) = i;
       sum += i*i*i;
     }
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   // set them to zero again
   v = 0;

diff --git a/tests/petsc/35.cc b/tests/petsc/35.cc
index bf0b6bcd51f763e7ef70af98a3ac8a86f06c7ce3..8742a8bd6429f6b7e9fd8acd95baa192df3a7274 100644 (file)
--- a/tests/petsc/35.cc
+++ b/tests/petsc/35.cc
@@ -37,8 +37,8 @@ void test (PETScWrappers::Vector &v,
         w(i) = i+1.;
     }
 
-  v.compress ();
-  w.compress ();
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
 
   v += w;
 

diff --git a/tests/petsc/36.cc b/tests/petsc/36.cc
index a0eeea75eeedd80aeb0a5a99fc3a82d419f428f7..522f9cb116f09f8185b67ba273779faa1b51fb9e 100644 (file)
--- a/tests/petsc/36.cc
+++ b/tests/petsc/36.cc
@@ -37,8 +37,8 @@ void test (PETScWrappers::Vector &v,
         w(i) = i+1.;
     }
 
-  v.compress ();
-  w.compress ();
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
 
   v -= w;
 

diff --git a/tests/petsc/37.cc b/tests/petsc/37.cc
index ff11c6aabe25c70f43a0eaf55f5f7c5d69d18957..f513e665f614b11262660b8cc26fbc5ab5c594e9 100644 (file)
--- a/tests/petsc/37.cc
+++ b/tests/petsc/37.cc
@@ -30,7 +30,7 @@ void test (PETScWrappers::Vector &v)
   for (unsigned int i=0; i<v.size(); ++i)
     v(i) = i;
 
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   v.add (1.);
 

diff --git a/tests/petsc/38.cc b/tests/petsc/38.cc
index aacb319b3dec5a24283afcaf7afa58b5bebb91e9..ba288ac96f17c0ebc336bb134c9821583a59008e 100644 (file)
--- a/tests/petsc/38.cc
+++ b/tests/petsc/38.cc
@@ -34,8 +34,8 @@ void test (PETScWrappers::Vector &v,
       w(i) = i+1.;
     }
 
-  v.compress ();
-  w.compress ();
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
 
   v.add (w);
 

diff --git a/tests/petsc/39.cc b/tests/petsc/39.cc
index 662e3334f289bc76403b685a7490d0165019f955..bed8660b2b82f4f732828412a0fa12ef29741108 100644 (file)
--- a/tests/petsc/39.cc
+++ b/tests/petsc/39.cc
@@ -34,8 +34,8 @@ void test (PETScWrappers::Vector &v,
       w(i) = i+1.;
     }
 
-  v.compress ();
-  w.compress ();
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
 
   v.add (2, w);
 

diff --git a/tests/petsc/40.cc b/tests/petsc/40.cc
index 1ea51675ae49d8d695a8fa634d10fa8ac1fcf201..752a2765f88c5d216184de416962fafd020b4a19 100644 (file)
--- a/tests/petsc/40.cc
+++ b/tests/petsc/40.cc
@@ -36,9 +36,9 @@ void test (PETScWrappers::Vector &v,
       x(i) = i+2.;
     }
 
-  v.compress ();
-  w.compress ();
-  x.compress ();
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
+  x.compress (VectorOperation::add);
 
   v.add (2, w, 3, x);
 

diff --git a/tests/petsc/41.cc b/tests/petsc/41.cc
index feca17d76569b37873b4c8a041599508f9d47ee9..69c98d621f363aef717da340dec8c5d6c3202934 100644 (file)
--- a/tests/petsc/41.cc
+++ b/tests/petsc/41.cc
@@ -34,8 +34,8 @@ void test (PETScWrappers::Vector &v,
       w(i) = i+1.;
     }
 
-  v.compress ();
-  w.compress ();
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
 
   v.sadd (2, w);
 

diff --git a/tests/petsc/42.cc b/tests/petsc/42.cc
index caf0d11fd62d135210a889d5a829ce543838b205..0591ff5fc77fb940881eb37bb06a98c5a41cff64 100644 (file)
--- a/tests/petsc/42.cc
+++ b/tests/petsc/42.cc
@@ -34,8 +34,8 @@ void test (PETScWrappers::Vector &v,
       w(i) = i+1.;
     }
 
-  v.compress ();
-  w.compress ();
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
 
   v.sadd (3, 2, w);
 

diff --git a/tests/petsc/43.cc b/tests/petsc/43.cc
index 5675ffb3529756ace76aaf372753bacebd043e05..216c4b0c4bf741cdc7fd98b2b7fa4c407e36c181 100644 (file)
--- a/tests/petsc/43.cc
+++ b/tests/petsc/43.cc
@@ -36,9 +36,9 @@ void test (PETScWrappers::Vector &v,
       x(i) = i+2.;
     }
 
-  v.compress ();
-  w.compress ();
-  x.compress ();
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
+  x.compress (VectorOperation::add);
 
   v.sadd (1.5, 2, w, 3, x);
 

diff --git a/tests/petsc/44.cc b/tests/petsc/44.cc
index f53690ca539f65ff198ff93dcee828463a24805e..22ef05478c50368878e8ba869b0cc59bac910721 100644 (file)
--- a/tests/petsc/44.cc
+++ b/tests/petsc/44.cc
@@ -38,10 +38,10 @@ void test (PETScWrappers::Vector &v,
       y(i) = i+3.;
     }
 
-  v.compress ();
-  w.compress ();
-  x.compress ();
-  y.compress ();
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
+  x.compress (VectorOperation::add);
+  y.compress (VectorOperation::add);
 
   v.sadd (1.5, 2, w, 3, x, 4, y);
 

diff --git a/tests/petsc/45.cc b/tests/petsc/45.cc
index c63f0f2787455ceab3ff745e631a92135ebad054..4562d006e250759f56cfa63a1fd0f0edff362b7e 100644 (file)
--- a/tests/petsc/45.cc
+++ b/tests/petsc/45.cc
@@ -34,8 +34,8 @@ void test (PETScWrappers::Vector &v,
       w(i) = i+1.;
     }
 
-  v.compress ();
-  w.compress ();
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
 
   v.scale (w);
 

diff --git a/tests/petsc/46.cc b/tests/petsc/46.cc
index c063b757214e4002cc0b9942d6f21d47c00cd646..296c5e184d16bc9274bd9b1b237bff841aff987e 100644 (file)
--- a/tests/petsc/46.cc
+++ b/tests/petsc/46.cc
@@ -34,8 +34,8 @@ void test (PETScWrappers::Vector &v,
       w(i) = i+1.;
     }
 
-  v.compress ();
-  w.compress ();
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
 
   v.equ (2, w);
 

diff --git a/tests/petsc/47.cc b/tests/petsc/47.cc
index d3065bf076f9cd71d8682b7477fbe2d9251298ae..feb0c52086d065973b6f21d301a5187e937c1e5a 100644 (file)
--- a/tests/petsc/47.cc
+++ b/tests/petsc/47.cc
@@ -36,9 +36,9 @@ void test (PETScWrappers::Vector &v,
       x(i) = i+2.;
     }
 
-  v.compress ();
-  w.compress ();
-  x.compress ();
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
+  x.compress (VectorOperation::add);
 
   v.equ (2, w, 3, x);
 

diff --git a/tests/petsc/48.cc b/tests/petsc/48.cc
index cb99358075e7d4f3066703f477c96efc26069785..da45ea1145389576ccb0ce22a7918f3c87209d7e 100644 (file)
--- a/tests/petsc/48.cc
+++ b/tests/petsc/48.cc
@@ -36,9 +36,9 @@ void test (PETScWrappers::Vector &v,
       x(i) = i+2.;
     }
 
-  v.compress ();
-  w.compress ();
-  x.compress ();
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
+  x.compress (VectorOperation::add);
 
   v.ratio (w, x);
 

diff --git a/tests/petsc/51.cc b/tests/petsc/51.cc
index f7b826b64f450d3324f1c93f19e59b92412e0c49..5cc1155cde3356d3c2305bf16fd9b12f02ff3335 100644 (file)
--- a/tests/petsc/51.cc
+++ b/tests/petsc/51.cc
@@ -31,11 +31,11 @@ void test (PETScWrappers::Vector &v)
   for (unsigned int i=0; i<v.size(); ++i)
     if (i%3 == 0)
       v(i) = i+1.;
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   // then copy it
   PETScWrappers::Vector w (v);
-  w.compress ();
+  w.compress (VectorOperation::add);
 
   // make sure they're equal
   deallog << v *w << ' ' << v.l2_norm() * w.l2_norm()

diff --git a/tests/petsc/52.cc b/tests/petsc/52.cc
index 3cf2e2e38d2ad487adc1dd0a279f52748b304f6b..754e61c7bd4ac94106b2eb7bb3f62c69897aa090 100644 (file)
--- a/tests/petsc/52.cc
+++ b/tests/petsc/52.cc
@@ -34,7 +34,7 @@ void test (PETScWrappers::SparseMatrix &m)
       if ((i+2*j+1) % 3 == 0)
         m.set (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/petsc/55.cc b/tests/petsc/55.cc
index a6dd4500678b2299671fa66d844b94d9e1167a3b..f50e927cf41a11fdbcc782f43aa3268a5c64781d 100644 (file)
--- a/tests/petsc/55.cc
+++ b/tests/petsc/55.cc
@@ -39,7 +39,7 @@ void test (PETScWrappers::Vector &v)
   for (unsigned int i=0; i<v.size(); i+=1+i)
     v(i) *= 2;
 
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   // check that they are ok, and this time
   // all of them

diff --git a/tests/petsc/56.cc b/tests/petsc/56.cc
index 8183680678f626743c646f7bf8c1d89af7e0ddbb..67a49d5b77a176e547dc1dd3da8fcd46a30ba33e 100644 (file)
--- a/tests/petsc/56.cc
+++ b/tests/petsc/56.cc
@@ -39,7 +39,7 @@ void test (PETScWrappers::Vector &v)
   for (unsigned int i=0; i<v.size(); i+=1+i)
     v(i) /= 2;
 
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   // check that they are ok, and this time
   // all of them

diff --git a/tests/petsc/57.cc b/tests/petsc/57.cc
index 4a20c3bfe8b7f6874a6a21737cd5454198e19304..b4bd1bfb0324ee1f08c78130a3c97001e0a1e88c 100644 (file)
--- a/tests/petsc/57.cc
+++ b/tests/petsc/57.cc
@@ -36,7 +36,7 @@ void test (PETScWrappers::Vector &v)
       pattern[i] = true;
     }
 
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   // check that the vector is really
   // non-negative

diff --git a/tests/petsc/58.cc b/tests/petsc/58.cc
index 5b195aeb5b170aafc1a11122bcbbb2bf3f462d70..0dbf5596112738bcbe5a2035499f52c5be012510 100644 (file)
--- a/tests/petsc/58.cc
+++ b/tests/petsc/58.cc
@@ -38,7 +38,7 @@ void test (PETScWrappers::Vector &v)
       pattern[i] = true;
     }
 
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   Vector<double> w (v);
   Vector<float>  x (v);

diff --git a/tests/petsc/59.cc b/tests/petsc/59.cc
index 3bb270d0fcff038df67403b4dad6cbf198f32860..6e2b45c94adc1117f45fedc4bef676a71426c57d 100644 (file)
--- a/tests/petsc/59.cc
+++ b/tests/petsc/59.cc
@@ -38,7 +38,7 @@ void test (PETScWrappers::Vector &v)
       pattern[i] = true;
     }
 
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   Vector<double> w (v);
   Vector<float>  x (v);

diff --git a/tests/petsc/60.cc b/tests/petsc/60.cc
index 77cba8303053b98888be071459d5e9d1f4ef3a1f..2c532bc0a34095bf3c4ec31ca0a22e657bf4f7ce 100644 (file)
--- a/tests/petsc/60.cc
+++ b/tests/petsc/60.cc
@@ -38,7 +38,7 @@ void test (PETScWrappers::Vector &v)
       pattern[i] = true;
     }
 
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   Vector<double> w;
   w=v;

diff --git a/tests/petsc/61.cc b/tests/petsc/61.cc
index 75547b0ebd3249c1285e5d46e3bfafd02d55bac8..d883b9813250b6eed0c4ff677f4629420eb68b8a 100644 (file)
--- a/tests/petsc/61.cc
+++ b/tests/petsc/61.cc
@@ -38,7 +38,7 @@ void test (PETScWrappers::Vector &v)
       pattern[i] = true;
     }
 
-  v.compress ();
+  v.compress (VectorOperation::add);
 
   Vector<double> w;
   w=v;

diff --git a/tests/petsc/66.cc b/tests/petsc/66.cc
index a921906e92465896b38226c2b86f4bb8e9b09198..16427b58b16524143343798afc12ab31b704edbe 100644 (file)
--- a/tests/petsc/66.cc
+++ b/tests/petsc/66.cc
@@ -59,7 +59,7 @@ void test (PETScWrappers::MatrixBase &m)
       norm_sqr += s*s;
       ++nnz;
     }
-  m.compress ();
+  m.compress (VectorOperation::add);
 
   deallog << m.frobenius_norm() << ' ' << std::sqrt (norm_sqr)
           << std::endl;

diff --git a/tests/petsc/67.cc b/tests/petsc/67.cc
index 565371457858d8ea35a884ce329607199828333c..6c18362cd95b3e5eb27fb3761d03cabe0f3d39da 100644 (file)
--- a/tests/petsc/67.cc
+++ b/tests/petsc/67.cc
@@ -61,7 +61,7 @@ void test (PETScWrappers::MatrixBase &m)
       norm_sqr += s*s;
       ++nnz;
     }
-  m.compress ();
+  m.compress (VectorOperation::add);
 
   deallog << m.frobenius_norm() << ' ' << std::sqrt (norm_sqr)
           << std::endl;

diff --git a/tests/petsc/68.cc b/tests/petsc/68.cc
index 676a852245596a07f9e39380b98858f432389fde..2719ce002a2cfad76df86bd20f7267130d1eb4b1 100644 (file)
--- a/tests/petsc/68.cc
+++ b/tests/petsc/68.cc
@@ -59,7 +59,7 @@ void test (PETScWrappers::MatrixBase &m)
       norm_sqr += s*s;
       ++nnz;
     }
-  m.compress ();
+  m.compress (VectorOperation::add);
 
   deallog << m.frobenius_norm() << ' ' << std::sqrt (norm_sqr)
           << std::endl;

diff --git a/tests/petsc/69.cc b/tests/petsc/69.cc
index 55e76a9394db800013484115ca14a610c337b767..c01c3f083904fb7e8fbb4e5f6601c0f075f863c8 100644 (file)
--- a/tests/petsc/69.cc
+++ b/tests/petsc/69.cc
@@ -61,7 +61,7 @@ void test (PETScWrappers::MatrixBase &m)
       norm_sqr += s*s;
       ++nnz;
     }
-  m.compress ();
+  m.compress (VectorOperation::add);
 
   deallog << m.frobenius_norm() << ' ' << std::sqrt (norm_sqr)
           << std::endl;

diff --git a/tests/petsc/deal_solver_01.cc b/tests/petsc/deal_solver_01.cc
index 1e73402ba099a573a096ca0aaf8d96935326bf34..88df05b7610bbfc9c11915d180941bdea3085576 100644 (file)
--- a/tests/petsc/deal_solver_01.cc
+++ b/tests/petsc/deal_solver_01.cc
@@ -86,9 +86,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     GrowingVectorMemory<PETScWrappers::Vector> mem;
     SolverCG<PETScWrappers::Vector> solver(control,mem);

diff --git a/tests/petsc/deal_solver_02.cc b/tests/petsc/deal_solver_02.cc
index 46f04c6fa5c9db83ce89506f65aa7bd53adce8f6..1a96781ed8e5f5853745b895c6322a4a2cd4f6f9 100644 (file)
--- a/tests/petsc/deal_solver_02.cc
+++ b/tests/petsc/deal_solver_02.cc
@@ -88,9 +88,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     GrowingVectorMemory<PETScWrappers::Vector> mem;
     SolverBicgstab<PETScWrappers::Vector> solver(control,mem);

diff --git a/tests/petsc/deal_solver_03.cc b/tests/petsc/deal_solver_03.cc
index 831ebb38ec143238ce8497f220e18af9b34e261c..795c13704accf6b64c2f8581da77f6bcc17af5e8 100644 (file)
--- a/tests/petsc/deal_solver_03.cc
+++ b/tests/petsc/deal_solver_03.cc
@@ -88,9 +88,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     GrowingVectorMemory<PETScWrappers::Vector> mem;
     SolverGMRES<PETScWrappers::Vector> solver(control,mem);

diff --git a/tests/petsc/deal_solver_04.cc b/tests/petsc/deal_solver_04.cc
index f4a88b8bc47e7d6e26106f177064da0cc93cecc9..378775dd98cdc963d76c2725566616a86df33d50 100644 (file)
--- a/tests/petsc/deal_solver_04.cc
+++ b/tests/petsc/deal_solver_04.cc
@@ -87,9 +87,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     GrowingVectorMemory<PETScWrappers::Vector> mem;
     SolverMinRes<PETScWrappers::Vector> solver(control,mem);

diff --git a/tests/petsc/deal_solver_05.cc b/tests/petsc/deal_solver_05.cc
index 033b498db63ef2dd4726b17d11e7a71b2b46debb..f6bf2ebd84f54457b42e93c7de1bc4b6280759f6 100644 (file)
--- a/tests/petsc/deal_solver_05.cc
+++ b/tests/petsc/deal_solver_05.cc
@@ -86,9 +86,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     GrowingVectorMemory<PETScWrappers::Vector> mem;
     SolverQMRS<PETScWrappers::Vector> solver(control,mem);

diff --git a/tests/petsc/full_matrix_01.cc b/tests/petsc/full_matrix_01.cc
index 6125db2d92906d8aec288d349dd735cac0df3fd3..697edcecab6bc07922d357ddb2899d5b6bd959af 100644 (file)
--- a/tests/petsc/full_matrix_01.cc
+++ b/tests/petsc/full_matrix_01.cc
@@ -33,7 +33,7 @@ void test (PETScWrappers::FullMatrix &m)
       if ((i+2*j+1) % 3 == 0)
         m.set (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/petsc/full_matrix_02.cc b/tests/petsc/full_matrix_02.cc
index 629ba76c6828078b52d5515046a14898a46b1023..1e9c279b1ca9488b92469cbbe9d469f888ca8089 100644 (file)
--- a/tests/petsc/full_matrix_02.cc
+++ b/tests/petsc/full_matrix_02.cc
@@ -33,7 +33,7 @@ void test (PETScWrappers::FullMatrix &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/petsc/full_matrix_05.cc b/tests/petsc/full_matrix_05.cc
index 36851aa8fcbba7619191fe3f1d13e1fc76d201b9..a59679105fdf6896d24c486e196d8cb19539249e 100644 (file)
--- a/tests/petsc/full_matrix_05.cc
+++ b/tests/petsc/full_matrix_05.cc
@@ -38,7 +38,7 @@ void test (PETScWrappers::FullMatrix &m)
           ++counter;
         }
 
-  m.compress ();
+  m.compress (VectorOperation::add);
 
   // check n_nonzero_elements then
   // output a dummy number.

diff --git a/tests/petsc/full_matrix_06.cc b/tests/petsc/full_matrix_06.cc
index 941c32f8fe831319641f9d96fa2fd324e2c77734..7c90c423e88c9713fb56516b9e659e1ab5a76fd9 100644 (file)
--- a/tests/petsc/full_matrix_06.cc
+++ b/tests/petsc/full_matrix_06.cc
@@ -33,7 +33,7 @@ void test (PETScWrappers::FullMatrix &m)
       if ((i+2*j+1) % 3 == 0)
         m.set (i,j, i*j*.5+.5);
 
-  m.compress ();
+  m.compress (VectorOperation::add);
 
   // compare against the exact value of the
   // l1-norm (max col-sum)

diff --git a/tests/petsc/full_matrix_07.cc b/tests/petsc/full_matrix_07.cc
index 29d8e07e0cd4e37ca893464ee4cad1ac4ffb3c84..98277237c5343e2e94f1802fbef36ff5546db9bc 100644 (file)
--- a/tests/petsc/full_matrix_07.cc
+++ b/tests/petsc/full_matrix_07.cc
@@ -33,7 +33,7 @@ void test (PETScWrappers::FullMatrix &m)
       if ((i+2*j+1) % 3 == 0)
         m.set (i,j, i*j*.5+.5);
 
-  m.compress ();
+  m.compress (VectorOperation::add);
 
   // compare against the exact value of the
   // linfty-norm (max row-sum)

diff --git a/tests/petsc/full_matrix_08.cc b/tests/petsc/full_matrix_08.cc
index f3c6201ccb2856a46ab37918bcdc2bd9afa42390..5e741375e1d4462df24255c548668d7ef2aa1d03 100644 (file)
--- a/tests/petsc/full_matrix_08.cc
+++ b/tests/petsc/full_matrix_08.cc
@@ -38,7 +38,7 @@ void test (PETScWrappers::FullMatrix &m)
         }
   norm = std::sqrt(norm);
 
-  m.compress ();
+  m.compress (VectorOperation::add);
 
   // compare against the exact value of the
   // l2-norm (max row-sum)

diff --git a/tests/petsc/full_matrix_09.cc b/tests/petsc/full_matrix_09.cc
index a7b0bb8a087d6855def9c858f2a90caa52bcdc97..22781e7e10ccdcfdae5736de58ce5b24476a7361 100644 (file)
--- a/tests/petsc/full_matrix_09.cc
+++ b/tests/petsc/full_matrix_09.cc
@@ -32,7 +32,7 @@ void test (PETScWrappers::FullMatrix &m)
       if ((i+2*j+1) % 3 == 0)
         m.set (i,j, i*j*.5+.5);
 
-  m.compress ();
+  m.compress (VectorOperation::add);
 
   // then multiply everything by 1.25 and
   // make sure we retrieve the values we

diff --git a/tests/petsc/full_matrix_10.cc b/tests/petsc/full_matrix_10.cc
index 203f39f0bc084bca476bc8b1f50b51c4805ec58f..f66fc561334479cf07cd6e86b2fdb9fe083515f2 100644 (file)
--- a/tests/petsc/full_matrix_10.cc
+++ b/tests/petsc/full_matrix_10.cc
@@ -32,7 +32,7 @@ void test (PETScWrappers::FullMatrix &m)
       if ((i+2*j+1) % 3 == 0)
         m.set (i,j, i*j*.5+.5);
 
-  m.compress ();
+  m.compress (VectorOperation::add);
 
   // then divide everything by 4/3 and
   // make sure we retrieve the values we

diff --git a/tests/petsc/full_matrix_iterator_01.cc b/tests/petsc/full_matrix_iterator_01.cc
index 94d29eb3cf1f5a8bbb1055e7f245083f2755b15f..a5c1ad4c26b72cba7a841f056f7b6da40b86fd36 100644 (file)
--- a/tests/petsc/full_matrix_iterator_01.cc
+++ b/tests/petsc/full_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::add);
   PETScWrappers::FullMatrix::const_iterator i = m.begin();
   deallog << i->row() << ' ' << i->column() << ' ' << i->value() << std::endl;
   ++i;

diff --git a/tests/petsc/full_matrix_vector_01.cc b/tests/petsc/full_matrix_vector_01.cc
index daabd4732884a60645a208cc2d668d0bf56087cb..392252810eed540a8b8b8ecd15846e608600135b 100644 (file)
--- a/tests/petsc/full_matrix_vector_01.cc
+++ b/tests/petsc/full_matrix_vector_01.cc
@@ -37,9 +37,9 @@ void test (PETScWrappers::Vector &v,
   for (unsigned int i=0; i<v.size(); ++i)
     v(i) = i;
 
-  m.compress ();
-  v.compress ();
-  w.compress ();
+  m.compress (VectorOperation::add);
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
 
   // w:=Mv
   m.vmult (w,v);

diff --git a/tests/petsc/full_matrix_vector_02.cc b/tests/petsc/full_matrix_vector_02.cc
index 6bf332a6f1e60ef14af2b0ef5a6a81e74f432748..b84340e73c03cfd4e2d2d842b0d6907a7ee46363 100644 (file)
--- a/tests/petsc/full_matrix_vector_02.cc
+++ b/tests/petsc/full_matrix_vector_02.cc
@@ -37,9 +37,9 @@ void test (PETScWrappers::Vector &v,
   for (unsigned int i=0; i<v.size(); ++i)
     v(i) = i;
 
-  m.compress ();
-  v.compress ();
-  w.compress ();
+  m.compress (VectorOperation::add);
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
 
   // w:=Mv
   m.Tvmult (w,v);

diff --git a/tests/petsc/full_matrix_vector_03.cc b/tests/petsc/full_matrix_vector_03.cc
index 1309f3cb23c0b72c3fe1033db4d3f1c78feb3924..f1315a707b15a9feb58cee1fbfcd8d1e02972919 100644 (file)
--- a/tests/petsc/full_matrix_vector_03.cc
+++ b/tests/petsc/full_matrix_vector_03.cc
@@ -40,9 +40,9 @@ void test (PETScWrappers::Vector &v,
       w(i) = i;
     }
 
-  m.compress ();
-  v.compress ();
-  w.compress ();
+  m.compress (VectorOperation::add);
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
 
   // w:=Mv
   m.vmult_add (w,v);

diff --git a/tests/petsc/full_matrix_vector_04.cc b/tests/petsc/full_matrix_vector_04.cc
index 4ed5c1b261d77c44fcb0f4a33daf761355ca44ab..eaad49e52e7be8f1c05739fa9a4322a09c8a3d30 100644 (file)
--- a/tests/petsc/full_matrix_vector_04.cc
+++ b/tests/petsc/full_matrix_vector_04.cc
@@ -40,9 +40,9 @@ void test (PETScWrappers::Vector &v,
       w(i) = i;
     }
 
-  m.compress ();
-  v.compress ();
-  w.compress ();
+  m.compress (VectorOperation::add);
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
 
   // w:=Mv
   m.Tvmult_add (w,v);

diff --git a/tests/petsc/full_matrix_vector_05.cc b/tests/petsc/full_matrix_vector_05.cc
index 1d67d92f3d0d72baf04593e23137fd827b7ba8b4..565405adfab2657f216177c19ac8f3d6e4c75d6d 100644 (file)
--- a/tests/petsc/full_matrix_vector_05.cc
+++ b/tests/petsc/full_matrix_vector_05.cc
@@ -40,9 +40,9 @@ void test (PETScWrappers::Vector &v,
       w(i) = i+1;
     }
 
-  m.compress ();
-  v.compress ();
-  w.compress ();
+  m.compress (VectorOperation::add);
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
 
   // <w,Mv>
   const PetscScalar s = m.matrix_scalar_product (w,v);

diff --git a/tests/petsc/full_matrix_vector_06.cc b/tests/petsc/full_matrix_vector_06.cc
index 5514768e607422688166e7d27819129635b623a7..07b61100e784dd0938f02dd21e3cec15d161883c 100644 (file)
--- a/tests/petsc/full_matrix_vector_06.cc
+++ b/tests/petsc/full_matrix_vector_06.cc
@@ -36,8 +36,8 @@ void test (PETScWrappers::Vector &v)
   for (unsigned int i=0; i<v.size(); ++i)
     v(i) = i;
 
-  m.compress ();
-  v.compress ();
+  m.compress (VectorOperation::add);
+  v.compress (VectorOperation::add);
 
   // <w,Mv>
   const PetscScalar s = m.matrix_norm_square (v);

diff --git a/tests/petsc/full_matrix_vector_07.cc b/tests/petsc/full_matrix_vector_07.cc
index 4eead31ae6fdd6e092fec66528954c390a08bd57..93f4876507607689fad1ab0353e9dc8e697ea94b 100644 (file)
--- a/tests/petsc/full_matrix_vector_07.cc
+++ b/tests/petsc/full_matrix_vector_07.cc
@@ -41,9 +41,9 @@ void test (PETScWrappers::Vector &v,
       w(i) = i+1;
     }
 
-  m.compress ();
-  v.compress ();
-  w.compress ();
+  m.compress (VectorOperation::add);
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
 
   // x=w-Mv
   const double s = m.residual (x, v, w);

diff --git a/tests/petsc/parallel_sparse_matrix_01.cc b/tests/petsc/parallel_sparse_matrix_01.cc
index fc1cfb4e94a1ff8543df784716d0ec5a11e95ff0..24f5ba83160b20691377d4c66e61402a045ee9da 100644 (file)
--- a/tests/petsc/parallel_sparse_matrix_01.cc
+++ b/tests/petsc/parallel_sparse_matrix_01.cc
@@ -112,7 +112,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/petsc/slowness_01.cc b/tests/petsc/slowness_01.cc
index 7290ec6caa47b9a65ed19b10c7f416996ab95a4f..09176095b39a9052bb8a3d440e46f34860db40e8 100644 (file)
--- a/tests/petsc/slowness_01.cc
+++ b/tests/petsc/slowness_01.cc
@@ -63,7 +63,7 @@ void test ()
             sparsity.add(global, global+N);
           }
       }
-  sparsity.compress();
+  sparsity.compress (VectorOperation::add);
 
 
   // next build the sparse matrix itself

diff --git a/tests/petsc/slowness_02.cc b/tests/petsc/slowness_02.cc
index 9611d27990e59c1652a3ad9d930b0fe3bb430fa8..a5b4c63d8a255315e9ba7ab57ff2cccaee2fa10a 100644 (file)
--- a/tests/petsc/slowness_02.cc
+++ b/tests/petsc/slowness_02.cc
@@ -63,7 +63,7 @@ void test ()
             matrix.add(global, global+N, -1);
           }
       }
-  matrix.compress ();
+  matrix.compress (VectorOperation::add);
 
 
   // then do a single matrix-vector

diff --git a/tests/petsc/slowness_03.cc b/tests/petsc/slowness_03.cc
index d004153eb070c290660a6a12c9bec749b6ace608..8b3687f811d4fc60a3ea3c4c9d1e8047bdbad390 100644 (file)
--- a/tests/petsc/slowness_03.cc
+++ b/tests/petsc/slowness_03.cc
@@ -66,7 +66,7 @@ void test ()
             matrix.add(global, global+N, -1);
           }
       }
-  matrix.compress ();
+  matrix.compress (VectorOperation::add);
 
   // then do a single matrix-vector
   // multiplication with subsequent formation

diff --git a/tests/petsc/slowness_04.cc b/tests/petsc/slowness_04.cc
index 221ff387144049e392a972b7836b4bd14d9f5ff8..295bc369660c47ae93c546d5c6816b00be7fd42c 100644 (file)
--- a/tests/petsc/slowness_04.cc
+++ b/tests/petsc/slowness_04.cc
@@ -97,7 +97,7 @@ void test ()
             matrix.add(global, global+N, rand());
           }
       }
-  matrix.compress ();
+  matrix.compress (VectorOperation::add);
 
   // then do a single matrix-vector
   // multiplication with subsequent formation

diff --git a/tests/petsc/solver_01.cc b/tests/petsc/solver_01.cc
index 5c68a79f410d357fcbb7b907647352347f9e7046..9a7c99f66a033c5a444d352d9c2be980614afa86 100644 (file)
--- a/tests/petsc/solver_01.cc
+++ b/tests/petsc/solver_01.cc
@@ -80,9 +80,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     PETScWrappers::SolverRichardson solver(control);
     PETScWrappers::PreconditionJacobi preconditioner(A);

diff --git a/tests/petsc/solver_02.cc b/tests/petsc/solver_02.cc
index baf08b9793dd6e8e553b699f6e010d079fff06ab..e534c96a45cff3682eacd02a9018e33072ff16b9 100644 (file)
--- a/tests/petsc/solver_02.cc
+++ b/tests/petsc/solver_02.cc
@@ -80,9 +80,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     PETScWrappers::SolverChebychev solver(control);
     PETScWrappers::PreconditionJacobi preconditioner(A);

diff --git a/tests/petsc/solver_03.cc b/tests/petsc/solver_03.cc
index 57b908cc00a032b2e9d0ea260cc4713d19d164b2..74524db36300fbfebed6ab2ddb054569eae55620 100644 (file)
--- a/tests/petsc/solver_03.cc
+++ b/tests/petsc/solver_03.cc
@@ -81,9 +81,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     PETScWrappers::SolverCG solver(control);
     PETScWrappers::PreconditionJacobi preconditioner(A);

diff --git a/tests/petsc/solver_03_mf.cc b/tests/petsc/solver_03_mf.cc
index 84428afb5471348f983a73258ffcfcd6c9181689..4debf5c5c56277a0bce15a504a8b3401e4eba564 100644 (file)
--- a/tests/petsc/solver_03_mf.cc
+++ b/tests/petsc/solver_03_mf.cc
@@ -79,9 +79,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     PETScWrappers::SolverCG solver(control);
     PETScWrappers::PreconditionNone preconditioner(A);

diff --git a/tests/petsc/solver_03_precondition_boomeramg.cc b/tests/petsc/solver_03_precondition_boomeramg.cc
index 8c452a78b1f31d8bfd6eeafbac5747b34c61e0eb..e775a8e41e49cb0eeda58f615d6ee83109ee375d 100644 (file)
--- a/tests/petsc/solver_03_precondition_boomeramg.cc
+++ b/tests/petsc/solver_03_precondition_boomeramg.cc
@@ -82,9 +82,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     PETScWrappers::SolverCG solver(control);
     PETScWrappers::PreconditionBoomerAMG preconditioner(A);

diff --git a/tests/petsc/solver_03_precondition_boomeramg_symmetric.cc b/tests/petsc/solver_03_precondition_boomeramg_symmetric.cc
index 73a442f1a55924dfe892ce58d59c23ce6f9bb499..782e461eea6d46782b5f8adf030e7c4bf39afc79 100644 (file)
--- a/tests/petsc/solver_03_precondition_boomeramg_symmetric.cc
+++ b/tests/petsc/solver_03_precondition_boomeramg_symmetric.cc
@@ -83,9 +83,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     PETScWrappers::SolverCG solver(control);
     PETScWrappers::PreconditionBoomerAMG preconditioner(A, true);

diff --git a/tests/petsc/solver_03_precondition_eisenstat.cc b/tests/petsc/solver_03_precondition_eisenstat.cc
index 6551a25c05d1343141bafcafd43e7889c812a06e..70a6b99b128c45611c99c4792c257f1482f4985c 100644 (file)
--- a/tests/petsc/solver_03_precondition_eisenstat.cc
+++ b/tests/petsc/solver_03_precondition_eisenstat.cc
@@ -81,9 +81,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     PETScWrappers::SolverCG solver(control);
     PETScWrappers::PreconditionEisenstat preconditioner(A);

diff --git a/tests/petsc/solver_03_precondition_icc.cc b/tests/petsc/solver_03_precondition_icc.cc
index 6849d749796329577bc72e04a15066919b0640b9..628bee413ffecdff6ad1c0c6ec31790a9b20d2e5 100644 (file)
--- a/tests/petsc/solver_03_precondition_icc.cc
+++ b/tests/petsc/solver_03_precondition_icc.cc
@@ -81,9 +81,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     PETScWrappers::SolverCG solver(control);
     PETScWrappers::PreconditionICC preconditioner(A);

diff --git a/tests/petsc/solver_03_precondition_ilu.cc b/tests/petsc/solver_03_precondition_ilu.cc
index faad508f0ac0f1c47896701acb8d204f6f0111b0..477852b01d52f0ef0c881827463977b397fd58de 100644 (file)
--- a/tests/petsc/solver_03_precondition_ilu.cc
+++ b/tests/petsc/solver_03_precondition_ilu.cc
@@ -81,9 +81,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     PETScWrappers::SolverCG solver(control);
     PETScWrappers::PreconditionILU preconditioner(A);

diff --git a/tests/petsc/solver_03_precondition_lu.cc b/tests/petsc/solver_03_precondition_lu.cc
index beabcf434abae689b25e36a8d33c4eddfa324d62..ca0af140cbea64e30df3161bf4593d6f40f7686a 100644 (file)
--- a/tests/petsc/solver_03_precondition_lu.cc
+++ b/tests/petsc/solver_03_precondition_lu.cc
@@ -88,9 +88,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     PETScWrappers::SolverCG solver(control);
     PETScWrappers::PreconditionLU preconditioner(A);

diff --git a/tests/petsc/solver_03_precondition_parasails.cc b/tests/petsc/solver_03_precondition_parasails.cc
index 05ffee26f7e076cf7688856038dbb5cafc9dd6ff..3e8698282a38d50030a2bf44af7fddb7ee632f0b 100644 (file)
--- a/tests/petsc/solver_03_precondition_parasails.cc
+++ b/tests/petsc/solver_03_precondition_parasails.cc
@@ -81,9 +81,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     PETScWrappers::SolverCG solver(control);
     PETScWrappers::PreconditionParaSails preconditioner(A);

diff --git a/tests/petsc/solver_03_precondition_sor.cc b/tests/petsc/solver_03_precondition_sor.cc
index f0700eebc51cde7973ccf66849d630f035a27993..4a7893f6f4212a92fe5b13ebcf0016540aab77ec 100644 (file)
--- a/tests/petsc/solver_03_precondition_sor.cc
+++ b/tests/petsc/solver_03_precondition_sor.cc
@@ -81,9 +81,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     PETScWrappers::SolverCG solver(control);
     PETScWrappers::PreconditionSOR preconditioner(A);

diff --git a/tests/petsc/solver_03_precondition_ssor.cc b/tests/petsc/solver_03_precondition_ssor.cc
index 67fd339d47eba2d62db1b24bab75107e5d646b3b..64ffcf8a55f1c7dd11c5866bf7637cf097d499cd 100644 (file)
--- a/tests/petsc/solver_03_precondition_ssor.cc
+++ b/tests/petsc/solver_03_precondition_ssor.cc
@@ -81,9 +81,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     PETScWrappers::SolverCG solver(control);
     PETScWrappers::PreconditionSSOR preconditioner(A);

diff --git a/tests/petsc/solver_04.cc b/tests/petsc/solver_04.cc
index 2d9819fba45f536d09d2a9a3d59ebed37b82938b..57fc9afb533365bf7dbc01d5b1822afa21a2e65d 100644 (file)
--- a/tests/petsc/solver_04.cc
+++ b/tests/petsc/solver_04.cc
@@ -81,9 +81,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     PETScWrappers::SolverBiCG solver(control);
     PETScWrappers::PreconditionJacobi preconditioner(A);

diff --git a/tests/petsc/solver_05.cc b/tests/petsc/solver_05.cc
index 15f6466e8cdb666e673cbefa4ba3b567b27f0f60..be72a50a579e54a55857883c04ad11f4e60177df 100644 (file)
--- a/tests/petsc/solver_05.cc
+++ b/tests/petsc/solver_05.cc
@@ -81,9 +81,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     PETScWrappers::SolverGMRES solver(control);
     PETScWrappers::PreconditionJacobi preconditioner(A);

diff --git a/tests/petsc/solver_06.cc b/tests/petsc/solver_06.cc
index e19bddaf0c37f758ab55db3e83253a87c11296cd..bccd1a5c76773f8aff8cfd52d930f7329f890e63 100644 (file)
--- a/tests/petsc/solver_06.cc
+++ b/tests/petsc/solver_06.cc
@@ -81,9 +81,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     PETScWrappers::SolverBicgstab solver(control);
     PETScWrappers::PreconditionJacobi preconditioner(A);

diff --git a/tests/petsc/solver_07.cc b/tests/petsc/solver_07.cc
index 12d44a6ae2f123a9eb0e798f0d70e8385fd9cb1f..30b25fa35699831e1cc94c73bf803e6f90aa604f 100644 (file)
--- a/tests/petsc/solver_07.cc
+++ b/tests/petsc/solver_07.cc
@@ -81,9 +81,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     PETScWrappers::SolverCGS solver(control);
     PETScWrappers::PreconditionJacobi preconditioner(A);

diff --git a/tests/petsc/solver_08.cc b/tests/petsc/solver_08.cc
index 56b38ef60d7fb64428bc38a24fb160eaa8e5bcf1..6d680f144826532fc5c728c7d91225ed92694afa 100644 (file)
--- a/tests/petsc/solver_08.cc
+++ b/tests/petsc/solver_08.cc
@@ -81,9 +81,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     PETScWrappers::SolverTFQMR solver(control);
     PETScWrappers::PreconditionJacobi preconditioner(A);

diff --git a/tests/petsc/solver_09.cc b/tests/petsc/solver_09.cc
index 3297bd8fe2176de9dfe39dda041781740a867dd2..884195c2784446926611fc4acbb87b229606b448 100644 (file)
--- a/tests/petsc/solver_09.cc
+++ b/tests/petsc/solver_09.cc
@@ -85,9 +85,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     PETScWrappers::SolverTCQMR solver(control);
     PETScWrappers::PreconditionJacobi preconditioner(A);

diff --git a/tests/petsc/solver_10.cc b/tests/petsc/solver_10.cc
index df81e7dbd2487ce565ba76f0349e29d49ae5e9ae..9e4c41e08eb294d9cd8b99dbf43a5fce83b06da6 100644 (file)
--- a/tests/petsc/solver_10.cc
+++ b/tests/petsc/solver_10.cc
@@ -81,9 +81,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     PETScWrappers::SolverCR solver(control);
     PETScWrappers::PreconditionJacobi preconditioner(A);

diff --git a/tests/petsc/solver_11.cc b/tests/petsc/solver_11.cc
index a7e585eb330d37e5f604f40d08a541644426e4ec..02c1e52981cc85bd7adfa79b0387ae5f3e93c8fe 100644 (file)
--- a/tests/petsc/solver_11.cc
+++ b/tests/petsc/solver_11.cc
@@ -82,9 +82,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     PETScWrappers::SolverLSQR solver(control);
     PETScWrappers::PreconditionJacobi preconditioner(A);

diff --git a/tests/petsc/solver_12.cc b/tests/petsc/solver_12.cc
index 79e44183a90999eddf4c38b125836451639fd5bc..39dc5468afd46e3bc353617c54983b7e1d9e4fa5 100644 (file)
--- a/tests/petsc/solver_12.cc
+++ b/tests/petsc/solver_12.cc
@@ -74,9 +74,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  f(dim);
     PETScWrappers::Vector  u(dim);
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     PETScWrappers::SolverPreOnly solver(control);
 

diff --git a/tests/petsc/solver_13.cc b/tests/petsc/solver_13.cc
index b28e88cafe33029c9368797b575133002a2df379..a567e11a630b53ad606945323e0e69d608fe3e17 100644 (file)
--- a/tests/petsc/solver_13.cc
+++ b/tests/petsc/solver_13.cc
@@ -72,9 +72,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  u(dim);
     u = 0.;
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress VectorOperation::add();
+    f.compress VectorOperation::add();
+    u.compress VectorOperation::add();
     PETScWrappers::Vector t=u;
 
     PETScWrappers::SolverPreOnly solver(control);

diff --git a/tests/petsc/sparse_direct_mumps.cc b/tests/petsc/sparse_direct_mumps.cc
index 01956e4e02b758617c231d772af1ffc2b92397b3..4ca1387710ac485e81efcb5a1e9270e527ffd14c 100644 (file)
--- a/tests/petsc/sparse_direct_mumps.cc
+++ b/tests/petsc/sparse_direct_mumps.cc
@@ -80,9 +80,9 @@ int main(int argc, char **argv)
     PETScWrappers::Vector  u(dim);
     u = 0.;
     f = 1.;
-    A.compress ();
-    f.compress ();
-    u.compress ();
+    A.compress (VectorOperation::add);
+    f.compress (VectorOperation::add);
+    u.compress (VectorOperation::add);
 
     SolverControl cn;
     PETScWrappers::SparseDirectMUMPS solver(cn);

diff --git a/tests/petsc/sparse_matrix_01.cc b/tests/petsc/sparse_matrix_01.cc
index d1482625ba05da2ba80ad80bf0f71841e1a4063b..767f140e60579b28ad519ba93636a3325eb3b2c8 100644 (file)
--- a/tests/petsc/sparse_matrix_01.cc
+++ b/tests/petsc/sparse_matrix_01.cc
@@ -34,13 +34,13 @@ void test ()
     for (unsigned int j=0; j<=i; ++j)
       m.set (i,j, i+2*j);
 
-  m.compress ();
+  m.compress (VectorOperation::add);
 
   PETScWrappers::SparseMatrix m2(s,s,s);
   m2.set(0,1,5.0);
   for (unsigned int i=0; i<m2.m(); ++i)
     m2.set(i,i,1.0+ i);
-  m2.compress();
+  m2.compress (VectorOperation::add);
 
   // we now print the matrix m,
   // print after adding m2, and then subtract m2 again

diff --git a/tests/petsc/sparse_matrix_02.cc b/tests/petsc/sparse_matrix_02.cc
index f4073e5e32ab575d6f36cd528abeae44b9a5705d..493bfda620e86e27e3f0c9ce27eebd3e80e977a6 100644 (file)
--- a/tests/petsc/sparse_matrix_02.cc
+++ b/tests/petsc/sparse_matrix_02.cc
@@ -35,7 +35,7 @@ void test ()
       m.set (i,j, i+2*j);
 
 
-  m.compress();
+  m.compress (VectorOperation::add);
 
   {
 

diff --git a/tests/petsc/sparse_matrix_iterator_01.cc b/tests/petsc/sparse_matrix_iterator_01.cc
index b070cc721c6db33d764dde56fb1096ee08300fc9..e9a1444dfdc41507d6266e9765cd60a6c4edd252 100644 (file)
--- a/tests/petsc/sparse_matrix_iterator_01.cc
+++ b/tests/petsc/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::add);
   PETScWrappers::SparseMatrix::const_iterator i = m.begin();
   deallog << i->row() << ' ' << i->column() << ' ' << i->value() << std::endl;
   ++i;

diff --git a/tests/petsc/sparse_matrix_vector_01.cc b/tests/petsc/sparse_matrix_vector_01.cc
index 656249941890cf6a3acfadc6e081ffbaaec9dad0..96094736a01632c1ea43ee6d1f0ee4a910735a6b 100644 (file)
--- a/tests/petsc/sparse_matrix_vector_01.cc
+++ b/tests/petsc/sparse_matrix_vector_01.cc
@@ -37,9 +37,9 @@ void test (PETScWrappers::Vector &v,
   for (unsigned int i=0; i<v.size(); ++i)
     v(i) = i;
 
-  m.compress ();
-  v.compress ();
-  w.compress ();
+  m.compress (VectorOperation::add);
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
 
   // w:=Mv
   m.vmult (w,v);

diff --git a/tests/petsc/sparse_matrix_vector_02.cc b/tests/petsc/sparse_matrix_vector_02.cc
index b127bb49eec24d957d03c43ce5a2e0845c453376..a0d345cc7828677acd3c2cb74322c05c77801666 100644 (file)
--- a/tests/petsc/sparse_matrix_vector_02.cc
+++ b/tests/petsc/sparse_matrix_vector_02.cc
@@ -37,9 +37,9 @@ void test (PETScWrappers::Vector &v,
   for (unsigned int i=0; i<v.size(); ++i)
     v(i) = i;
 
-  m.compress ();
-  v.compress ();
-  w.compress ();
+  m.compress (VectorOperation::add);
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
 
   // w:=Mv
   m.Tvmult (w,v);

diff --git a/tests/petsc/sparse_matrix_vector_03.cc b/tests/petsc/sparse_matrix_vector_03.cc
index 667d48d3c3b3846b09b40c2deadf5cd1e83d81b1..09728f409cacd2226fb42856c603fca3fd68e71b 100644 (file)
--- a/tests/petsc/sparse_matrix_vector_03.cc
+++ b/tests/petsc/sparse_matrix_vector_03.cc
@@ -40,9 +40,9 @@ void test (PETScWrappers::Vector &v,
       w(i) = i;
     }
 
-  m.compress ();
-  v.compress ();
-  w.compress ();
+  m.compress (VectorOperation::add);
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
 
   // w:=Mv
   m.vmult_add (w,v);

diff --git a/tests/petsc/sparse_matrix_vector_04.cc b/tests/petsc/sparse_matrix_vector_04.cc
index 357e719c5e7de5ccad57e8519e719c466f302d1e..6b311421a9d5a4dcf57d81f9a230d2f848072c4c 100644 (file)
--- a/tests/petsc/sparse_matrix_vector_04.cc
+++ b/tests/petsc/sparse_matrix_vector_04.cc
@@ -40,9 +40,9 @@ void test (PETScWrappers::Vector &v,
       w(i) = i;
     }
 
-  m.compress ();
-  v.compress ();
-  w.compress ();
+  m.compress (VectorOperation::add);
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
 
   // w:=Mv
   m.Tvmult_add (w,v);

diff --git a/tests/petsc/sparse_matrix_vector_05.cc b/tests/petsc/sparse_matrix_vector_05.cc
index d17bad38c15a119df1c9eadec3b009f349ac3b8a..6f83c1c0bb7a2868f6b53e0f3bf026a49c9166d9 100644 (file)
--- a/tests/petsc/sparse_matrix_vector_05.cc
+++ b/tests/petsc/sparse_matrix_vector_05.cc
@@ -40,9 +40,9 @@ void test (PETScWrappers::Vector &v,
       w(i) = i+1;
     }
 
-  m.compress ();
-  v.compress ();
-  w.compress ();
+  m.compress (VectorOperation::add);
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
 
   // <w,Mv>
   const PetscScalar s = m.matrix_scalar_product (w,v);

diff --git a/tests/petsc/sparse_matrix_vector_06.cc b/tests/petsc/sparse_matrix_vector_06.cc
index 59011500306eb73a2b046e8b7934817fc209bf1b..144d246bf8aeb4807a536e854193836f0e382d73 100644 (file)
--- a/tests/petsc/sparse_matrix_vector_06.cc
+++ b/tests/petsc/sparse_matrix_vector_06.cc
@@ -36,8 +36,8 @@ void test (PETScWrappers::Vector &v)
   for (unsigned int i=0; i<v.size(); ++i)
     v(i) = i;
 
-  m.compress ();
-  v.compress ();
+  m.compress (VectorOperation::add);
+  v.compress (VectorOperation::add);
 
   // <w,Mv>
   const PetscScalar s = m.matrix_norm_square (v);

diff --git a/tests/petsc/sparse_matrix_vector_07.cc b/tests/petsc/sparse_matrix_vector_07.cc
index 45bd1b80c8ca7720a8ab490d892200494daca3af..b4bfef4701f99b6957472c358473754b77106572 100644 (file)
--- a/tests/petsc/sparse_matrix_vector_07.cc
+++ b/tests/petsc/sparse_matrix_vector_07.cc
@@ -41,9 +41,9 @@ void test (PETScWrappers::Vector &v,
       w(i) = i+1;
     }
 
-  m.compress ();
-  v.compress ();
-  w.compress ();
+  m.compress (VectorOperation::add);
+  v.compress (VectorOperation::add);
+  w.compress (VectorOperation::add);
 
   // x=w-Mv
   const double s = m.residual (x, v, w);