]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Upgraded: PETSc vector to migrate to PETSc 3.0.0
authoryoung <young@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 31 Mar 2009 13:17:37 +0000 (13:17 +0000)
committeryoung <young@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 31 Mar 2009 13:17:37 +0000 (13:17 +0000)
git-svn-id: https://svn.dealii.org/trunk@18537 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/lac/include/lac/petsc_vector.h

index eb5ce4f0d3ce2658a40b5d884d880e1c90f599ee..e56bdccb835d9cd930d7d9f1ea8f6b3f031f8f9a 100644 (file)
@@ -286,23 +286,25 @@ namespace PETScWrappers
     AssertThrow (ierr == 0, ExcPETScError(ierr));
     
 #if ((PETSC_VERSION_MAJOR >= 2) && \
-    (PETSC_VERSION_MINOR >=3) &&  \
-    (PETSC_VERSION_SUBMINOR >=3))
+    (PETSC_VERSION_MINOR 3) &&  \
+    (PETSC_VERSION_SUBMINOR 3))
 
+    ierr = VecScatterBegin (static_cast<const Vec &>(v), vector,
+                            INSERT_VALUES, SCATTER_FORWARD, ctx);
+    AssertThrow (ierr == 0, ExcPETScError(ierr));
+   
+    ierr = VecScatterEnd (static_cast<const Vec &>(v), vector,
+                          INSERT_VALUES, SCATTER_FORWARD, ctx);
+
+#else
+    
     ierr = VecScatterBegin (ctx,static_cast<const Vec &>(v), vector,
                             INSERT_VALUES, SCATTER_FORWARD);
     AssertThrow (ierr == 0, ExcPETScError(ierr));
 
     ierr = VecScatterEnd (ctx, static_cast<const Vec &>(v), vector,
                           INSERT_VALUES, SCATTER_FORWARD);
-#else
-    
-    ierr = VecScatterBegin (static_cast<const Vec &>(v), vector,
-                            INSERT_VALUES, SCATTER_FORWARD, ctx);
-    AssertThrow (ierr == 0, ExcPETScError(ierr));
 
-    ierr = VecScatterEnd (static_cast<const Vec &>(v), vector,
-                          INSERT_VALUES, SCATTER_FORWARD, ctx);
 #endif        
     AssertThrow (ierr == 0, ExcPETScError(ierr));
 

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.