]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Merge pull request #12031 from bangerth/kinsol
authorDavid Wells <drwells@email.unc.edu>
Sat, 17 Apr 2021 13:24:19 +0000 (09:24 -0400)
committerGitHub <noreply@github.com>
Sat, 17 Apr 2021 13:24:19 +0000 (09:24 -0400)
Update the KINSOL callbacks to what KINSOL current provides.

1  2 
include/deal.II/sundials/kinsol.h
source/sundials/kinsol.cc

Simple merge
index 6ac153216ebdffc75f16ed18d0ef73f83719f091,d8009ce46825d0610911665b9e8942c26c6fcc09..40efb65469081e55ac1df7e6871402eb2ccb1b1a
@@@ -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

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.