Bugfix: Implement PETScWrappers::BlockVector::swap for different block sizes

diff --git a/include/deal.II/lac/petsc_parallel_block_vector.h b/include/deal.II/lac/petsc_parallel_block_vector.h
index 5294689154dfabcacc752302f5cd1956484cecec..24b435a98441755cc9c6d7213cc0b129596ccf91 100644 (file)
--- a/include/deal.II/lac/petsc_parallel_block_vector.h
+++ b/include/deal.II/lac/petsc_parallel_block_vector.h
@@ -531,11 +531,8 @@ namespace PETScWrappers
     void
     BlockVector::swap (BlockVector &v)
     {
-      Assert (this->n_blocks() == v.n_blocks(),
-              ExcDimensionMismatch(this->n_blocks(), v.n_blocks()));
+      std::swap(this->components, v.components);
 
-      for (unsigned int i=0; i<this->n_blocks(); ++i)
-        this->components[i].swap (v.components[i]);
       ::dealii::swap (this->block_indices, v.block_indices);
     }
 

diff --git a/source/lac/petsc_parallel_block_vector.cc b/source/lac/petsc_parallel_block_vector.cc
index 21d8ee066a2c01b55ec7a590f46ffc3959b73643..5c66680de4f38950865e66a300c27bcb44a2358a 100644 (file)
--- a/source/lac/petsc_parallel_block_vector.cc
+++ b/source/lac/petsc_parallel_block_vector.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2004 - 2014 by the deal.II authors
+// Copyright (C) 2004 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -30,8 +30,10 @@ namespace PETScWrappers
     BlockVector &
     BlockVector::operator = (const PETScWrappers::BlockVector &v)
     {
-      Assert (v.get_block_indices() == this->get_block_indices(),
-              ExcNonMatchingBlockVectors());
+      this->block_indices = v.get_block_indices();
+
+      if (this->components.size() != this->n_blocks())
+        this->components.resize(this->n_blocks());
 
       for (unsigned int i=0; i<this->n_blocks(); ++i)
         this->block(i) = v.block(i);