From e0033aba243fb8531b4f9d405d8d6045f315bc62 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Mon, 22 Jul 2024 06:55:47 -0500 Subject: [PATCH] Test sundials/kinsol_08: remove calls to deprecated and removed functions --- tests/sundials/kinsol_08.cc | 8 ++++++-- tests/sundials/kinsol_08.output.sundials7 | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 tests/sundials/kinsol_08.output.sundials7 diff --git a/tests/sundials/kinsol_08.cc b/tests/sundials/kinsol_08.cc index b38797aa4d..2ddddea730 100644 --- a/tests/sundials/kinsol_08.cc +++ b/tests/sundials/kinsol_08.cc @@ -112,10 +112,14 @@ main() J_inverse.vmult(dst, rhs); }; - kinsol.custom_setup = [](void *kinsol_mem) { - // test custom_setup callback by querying some information from KINSOL + kinsol.custom_setup = [](void *kinsol_mem [[maybe_unused]]) { + // test custom_setup callback by querying some information from KINSOL +#if DEAL_II_SUNDIALS_VERSION_LT(7, 0, 0) + // TODO: KINSetInfoHandlerFn and KINSetPrintLevel have been removed in + // version 7.0, so ideally do something else here. MM KINSetInfoHandlerFn(kinsol_mem, kinsol_info_callback, nullptr); KINSetPrintLevel(kinsol_mem, 1); +#endif }; VectorType v(N); diff --git a/tests/sundials/kinsol_08.output.sundials7 b/tests/sundials/kinsol_08.output.sundials7 new file mode 100644 index 0000000000..431b21399d --- /dev/null +++ b/tests/sundials/kinsol_08.output.sundials7 @@ -0,0 +1,20 @@ + +DEAL::Evaluating the solution at u=(0.500000,1.23400) +DEAL::Setting up Jacobian system at u=(0.500000,1.23400) +DEAL::Solving Jacobian system with rhs=(0.162480,-1.79816) +DEAL::Evaluating the solution at u=(0.500000,1.23400) +DEAL::Evaluating the solution at u=(-0.282294,0.265967) +DEAL::Setting up Jacobian system at u=(-0.282294,0.265967) +DEAL::Solving Jacobian system with rhs=(0.564722,-0.0107297) +DEAL::Evaluating the solution at u=(-0.282294,0.265967) +DEAL::Evaluating the solution at u=(-0.000445202,0.0468183) +DEAL::Setting up Jacobian system at u=(-0.000445202,0.0468183) +DEAL::Solving Jacobian system with rhs=(0.00196544,-0.0463907) +DEAL::Evaluating the solution at u=(-0.000445202,0.0468183) +DEAL::Evaluating the solution at u=(-0.000536539,0.000570488) +DEAL::Setting up Jacobian system at u=(-0.000536539,0.000570488) +DEAL::Solving Jacobian system with rhs=(0.00107308,-3.39491e-05) +DEAL::Evaluating the solution at u=(-0.000536554,0.000570504) +DEAL::Evaluating the solution at u=(-2.88123e-10,7.40347e-10) +-2.881e-10 7.403e-10 +DEAL::Converged in 4 iterations. -- 2.39.5