]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Let TrilinosWrappers::MPI::BlockVector::compress take the same argument as TrilinosWr...
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 21 Jan 2011 22:26:42 +0000 (22:26 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 21 Jan 2011 22:26:42 +0000 (22:26 +0000)
git-svn-id: https://svn.dealii.org/trunk@23233 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/doc/news/changes.h
deal.II/include/deal.II/lac/trilinos_block_vector.h
deal.II/source/lac/trilinos_block_vector.cc

index 35efa57dd17a8a1ce8015f0fdb1eecaab18c5ed5..2bc38e92ae8ec68e50cbebf58eb36bfe5488901c 100644 (file)
@@ -47,6 +47,13 @@ should be fixed now.
 <h3>Specific improvements</h3>
 
 <ol>
+<li> Changed: The TrilinosWrappers::MPI::BlockVector::compress function now takes an
+argument (with a default value) in exactly the same way as the
+TrilinosWrappers::MPI::Vector::compress function already did.
+<br>
+(Wolfgang Bangerth, 2011/01/21)
+</li>
+
 <li> Fixed: When calling DataOut::build_patches with a mapping, requesting more
 than one subdivision, and when <code>dim@<spacedim</code>, then some cells
 were not properly mapped. This is now fixed.
index 78defaef6d0ee6248000c3c15ece0ca21c3d3ce3..637320636fee3993d1ed23c14f26dd3e9ff96d56 100644 (file)
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$
 //
-//    Copyright (C) 2008, 2009, 2010 by the deal.II authors
+//    Copyright (C) 2008, 2009, 2010, 2011 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -308,11 +308,35 @@ namespace TrilinosWrappers
                                          const BlockVector                         &v);
 
                                         /**
-                                         * Compresses all the components
-                                         * after assembling together all
-                                         * elements.
+                                         * Compress the underlying
+                                         * representation of the Trilinos
+                                         * object, i.e. flush the buffers
+                                         * of the vector object if it has
+                                         * any. This function is
+                                         * necessary after writing into a
+                                         * vector element-by-element and
+                                         * before anything else can be
+                                         * done on it.
+                                         *
+                                         * The (defaulted) argument can
+                                         * be used to specify the
+                                         * compress mode
+                                         * (<code>Add</code> or
+                                         * <code>Insert</code>) in case
+                                         * the vector has not been
+                                         * written to since the last
+                                         * time this function was
+                                         * called. The argument is
+                                         * ignored if the vector has
+                                         * been added or written to
+                                         * since the last time
+                                         * compress() was called.
+                                         *
+                                         * See @ref GlossCompress "Compressing distributed objects"
+                                         * for more information.
+                                         * more information.
                                          */
-       void compress ();
+       void compress (const Epetra_CombineMode last_action = Zero);
 
                                         /**
                                          * Returns the state of the
index f353f7b4f9889e93e43811cead3bc139fcbd3420..706304d45ac506e8bceab27e03acb159626c1334 100644 (file)
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$
 //
-//    Copyright (C) 2008, 2009 by the deal.II authors
+//    Copyright (C) 2008, 2009, 2011 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -175,10 +175,10 @@ namespace TrilinosWrappers
 
 
     void
-    BlockVector::compress ()
+    BlockVector::compress (const Epetra_CombineMode last_action)
     {
       for (unsigned int i=0; i<n_blocks(); ++i)
-       components[i].compress();
+       components[i].compress(last_action);
     }
 
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.