From 0728d503b6d55d5c7741938f0008470637d83998 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Thu, 29 Sep 2016 14:19:48 +0200
Subject: [PATCH] update petsc code

- api changes in newer versions
- do not manually destroy the preconditioner. this is, and has always
  been, owned by the ksp object and dies with its destruction.
---
 opm/core/linalg/LinearSolverPetsc.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/opm/core/linalg/LinearSolverPetsc.cpp b/opm/core/linalg/LinearSolverPetsc.cpp
index abcdc1e47..3536e0d27 100644
--- a/opm/core/linalg/LinearSolverPetsc.cpp
+++ b/opm/core/linalg/LinearSolverPetsc.cpp
@@ -148,7 +148,6 @@ namespace{
             VecDestroy( &b );
             MatDestroy( &A );
             KSPDestroy( &ksp );
-            PCDestroy( &preconditioner );
         }
     };
 
@@ -197,7 +196,12 @@ namespace{
         PetscReal residual;
         KSPConvergedReason reason;
 
+#if PETSC_VERSION_MAJOR <= 3 && PETSC_VERSION_MINOR < 5
         KSPSetOperators( t.ksp, t.A, t.A, DIFFERENT_NONZERO_PATTERN );
+#else
+        KSPSetOperators( t.ksp, t.A, t.A );
+        KSPSetReusePreconditioner(t.ksp, PETSC_FALSE);
+#endif
         KSPGetPC( t.ksp, &t.preconditioner );
         auto err = KSPSetType( t.ksp, method );
         CHKERRXX( err );
@@ -216,7 +220,7 @@ namespace{
         if( ksp_view )
             KSPView( t.ksp, PETSC_VIEWER_STDOUT_WORLD );
 
-        err = PetscPrintf( PETSC_COMM_WORLD, "KSP Iterations %D, Final Residual %G\n", its, residual );
+        err = PetscPrintf( PETSC_COMM_WORLD, "KSP Iterations %D, Final Residual %g\n", its, (double)residual );
         CHKERRXX( err );
     }