From: David Wells <drwells@email.unc.edu>
Date: Sat, 17 Apr 2021 13:24:19 +0000 (-0400)
Subject: Merge pull request #12031 from bangerth/kinsol
X-Git-Tag: v9.3.0-rc1~215
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78a8940608fb1aaf6be978f1f52af4f4c6f727c7;p=dealii.git

Merge pull request #12031 from bangerth/kinsol

Update the KINSOL callbacks to what KINSOL current provides.
---

78a8940608fb1aaf6be978f1f52af4f4c6f727c7
diff --cc source/sundials/kinsol.cc
index 6ac153216e,d8009ce468..40efb65469
--- a/source/sundials/kinsol.cc
+++ b/source/sundials/kinsol.cc
@@@ -428,11 -457,11 +457,12 @@@ namespace SUNDIAL
      SUNMatrix       J  = nullptr;
      SUNLinearSolver LS = nullptr;
  
-     if (solve_jacobian_system) // user assigned a function object to the solver
-                                // slot
+     if (solve_jacobian_system ||
+         solve_with_jacobian) // user assigned a function object to the solver
+                              // slot
        {
 -#  if DEAL_II_SUNDIALS_VERSION_LT(5, 0, 0)
 +/* interface up to and including 4.0 */
 +#  if DEAL_II_SUNDIALS_VERSION_LT(4, 1, 0)
          auto KIN_mem        = static_cast<KINMem>(kinsol_mem);
          KIN_mem->kin_lsolve = solve_with_jacobian_callback<VectorType>;
          if (setup_jacobian) // user assigned a function object to the Jacobian