PETSc_3.10_SNESTEST_removed

===================================================================

Gbp-Pq: Name PETSc_3.10_SNESTEST_removed.patch

diff --git a/dolfin/la/PETScOptions.h b/dolfin/la/PETScOptions.h
index 37e5054b3becf123e1e6bc2f8925135821836bc7..5ae24e6f52f394c397c4c23aa0bc69c73f39a0ab 100644 (file)
--- a/dolfin/la/PETScOptions.h
+++ b/dolfin/la/PETScOptions.h
@@ -22,7 +22,7 @@
 
 #include <string>
 #include <boost/lexical_cast.hpp>
-#include <petscoptions.h>
+#include <petscsys.h>
 #include <dolfin/common/SubSystemsManager.h>
 #include <dolfin/log/log.h>
 #include "PETScObject.h"

diff --git a/dolfin/la/PETScVector.cpp b/dolfin/la/PETScVector.cpp
index 69e17954814f96c2330c2986175e081fb00c760f..1bfc83fc56612b5400ddbd7ea960fd968b984e33 100644 (file)
--- a/dolfin/la/PETScVector.cpp
+++ b/dolfin/la/PETScVector.cpp
@@ -749,7 +749,11 @@ void PETScVector::gather(GenericVector& y,
 
   // Perform scatter
   VecScatter scatter;
+#if PETSC_VERSION_GE(3,11,0)
+  ierr = VecScatterCreateWithData(_x, from, _y.vec(), to, &scatter);
+#else
   ierr = VecScatterCreate(_x, from, _y.vec(), to, &scatter);
+#endif
   CHECK_ERROR("VecScatterCreate");
   ierr = VecScatterBegin(scatter, _x, _y.vec(), INSERT_VALUES,
                          SCATTER_FORWARD);

diff --git a/dolfin/nls/PETScSNESSolver.cpp b/dolfin/nls/PETScSNESSolver.cpp
index 248e3f00664a6a084aac14d5ed3a65b3dd058795..29721e6d902e2096f39debd543cbeacfa324f837 100644 (file)
--- a/dolfin/nls/PETScSNESSolver.cpp
+++ b/dolfin/nls/PETScSNESSolver.cpp
@@ -48,7 +48,9 @@ PETScSNESSolver::_methods
 = { {"default",      {"default SNES method", ""}},
     {"newtonls",     {"Line search method", SNESNEWTONLS}},
     {"newtontr",     {"Trust region method", SNESNEWTONTR}},
+#if PETSC_VERSION_LT(3,10,0)
     {"test",         {"Tool to verify Jacobian approximation", SNESTEST}},
+#endif
     {"ngmres",       {"Nonlinear generalised minimum residual method",
                       SNESNGMRES}},
     {"nrichardson",  {"Richardson nonlinear method (Picard iteration)",