From: Debian Science Team <debian-science-maintainers@lists.alioth.debian.org>
Date: Mon, 11 Feb 2019 08:14:25 +0000 (+0000)
Subject: PETSc_3.10_SNESTEST_removed
X-Git-Tag: archive/raspbian/2019.2.0_git20200629.946dbd3-8+rpi1~1^2^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=31a86e1fdd066abdd6b38d10386b436d5953dd4c;p=dolfin.git

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 37e5054..5ae24e6 100644
--- 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 69e1795..1bfc83f 100644
--- 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 248e3f0..29721e6 100644
--- 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)",