]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
merge from mainline
authorheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 19 Feb 2013 18:14:00 +0000 (18:14 +0000)
committerheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 19 Feb 2013 18:14:00 +0000 (18:14 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_unify_linear_algebra@28476 0785d39b-7218-0410-832d-ea1e28bc413d

1  2 
deal.II/examples/step-13/step-13.cc
deal.II/examples/step-14/step-14.cc
deal.II/examples/step-42/step-42.cc
deal.II/examples/step-9/step-9.cc
deal.II/include/deal.II/base/utilities.h
deal.II/include/deal.II/lac/petsc_parallel_vector.h
deal.II/include/deal.II/lac/petsc_vector_base.h
deal.II/source/grid/grid_generator.cc

Simple merge
Simple merge
Simple merge
Simple merge
index bb549a72c8c784b014cfd2bb7e54d805a1b881e9,16e8d97a0a4c89486c872aa91325adedc3e41f2d..895c49a8cb4636a1c3fde098278364aafcf1f452
@@@ -525,11 -525,16 +525,18 @@@ namespace PETScWrapper
  
        const int ierr = VecCopy (v.vector, vector);
        AssertThrow (ierr == 0, ExcPETScError(ierr));
 -
 +      if (ghosted)
 +      update_ghost_values();
 +      
        if (has_ghost_elements())
-         update_ghost_values();
+         {
+           int ierr;
+           ierr = VecGhostUpdateBegin(vector, INSERT_VALUES, SCATTER_FORWARD);
+           AssertThrow (ierr == 0, ExcPETScError(ierr));
+           ierr = VecGhostUpdateEnd(vector, INSERT_VALUES, SCATTER_FORWARD);
+           AssertThrow (ierr == 0, ExcPETScError(ierr));
+         }
        return *this;
      }
  
Simple merge

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.