From 624c7df79489044785965bc0e3bc674be4525831 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Tue, 25 May 2021 13:31:15 -0600 Subject: [PATCH] Remove code for SUNDIALS versions prior to 3.0. --- source/sundials/arkode.cc | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/source/sundials/arkode.cc b/source/sundials/arkode.cc index 149200e00a..7626bcea66 100644 --- a/source/sundials/arkode.cc +++ b/source/sundials/arkode.cc @@ -129,11 +129,7 @@ namespace SUNDIALS *src_ypred, *src_fpred, jcurPtr_tmp); -# if DEAL_II_SUNDIALS_VERSION_GTE(2, 0, 0) - *jcurPtr = jcurPtr_tmp ? SUNTRUE : SUNFALSE; -# else - *jcurPtr = jcurPtr_tmp ? TRUE : FALSE; -# endif + *jcurPtr = jcurPtr_tmp ? SUNTRUE : SUNFALSE; return err; } @@ -144,11 +140,8 @@ namespace SUNDIALS int solve_with_jacobian_callback(ARKodeMem arkode_mem, N_Vector b, -# if DEAL_II_SUNDIALS_VERSION_LT(3, 0, 0) - N_Vector, -# endif - N_Vector ycur, - N_Vector fcur) + N_Vector ycur, + N_Vector fcur) { Assert(arkode_mem->ark_user_data != nullptr, ExcInternalError()); ARKode &solver = @@ -192,14 +185,7 @@ namespace SUNDIALS template int - solve_with_mass_matrix_callback(ARKodeMem arkode_mem, -# if DEAL_II_SUNDIALS_VERSION_LT(3, 0, 0) - N_Vector b, - N_Vector -# else - N_Vector b -# endif - ) + solve_with_mass_matrix_callback(ARKodeMem arkode_mem, N_Vector b) { Assert(arkode_mem->ark_user_data != nullptr, ExcInternalError()); ARKode &solver = @@ -580,9 +566,6 @@ namespace SUNDIALS if (setup_jacobian) { ARKode_mem->ark_lsetup = setup_jacobian_callback; -# if DEAL_II_SUNDIALS_VERSION_LT(3, 0, 0) - ARKode_mem->ark_setupNonNull = true; -# endif } } else @@ -600,9 +583,6 @@ namespace SUNDIALS if (setup_mass) { ARKode_mem->ark_msetup = setup_mass_matrix_callback; -# if DEAL_II_SUNDIALS_VERSION_LT(3, 0, 0) - ARKode_mem->ark_MassSetupNonNull = true; -# endif } } -- 2.39.5