From 45b83d2a663d24825c8a0c7bf244bc34685d1d1d Mon Sep 17 00:00:00 2001 From: David Wells Date: Fri, 19 May 2023 17:23:59 -0400 Subject: [PATCH] Fix compilation with ARKODE. Also fix a test which doesn't seem to throw an exception with newer versions of SUNDIALS. --- source/sundials/arkode.cc | 13 +- tests/sundials/arkode_11.output.noexception | 155 ++++++++++++++++++++ 2 files changed, 162 insertions(+), 6 deletions(-) create mode 100644 tests/sundials/arkode_11.output.noexception diff --git a/source/sundials/arkode.cc b/source/sundials/arkode.cc index 824899c4e7..bbd66ae247 100644 --- a/source/sundials/arkode.cc +++ b/source/sundials/arkode.cc @@ -660,13 +660,13 @@ namespace SUNDIALS { linear_solver = std::make_unique>( - solve_linearized_system + solve_linearized_system, + pending_exception # if DEAL_II_SUNDIALS_VERSION_GTE(6, 0, 0) , arkode_ctx # endif - , - pending_exception); + ); sun_linear_solver = *linear_solver; } else @@ -763,13 +763,14 @@ namespace SUNDIALS { mass_solver = std::make_unique>( - solve_mass + solve_mass, + + pending_exception # if DEAL_II_SUNDIALS_VERSION_GTE(6, 0, 0) , arkode_ctx # endif - , - pending_exception); + ); sun_mass_linear_solver = *mass_solver; } else diff --git a/tests/sundials/arkode_11.output.noexception b/tests/sundials/arkode_11.output.noexception new file mode 100644 index 0000000000..18f6b0a331 --- /dev/null +++ b/tests/sundials/arkode_11.output.noexception @@ -0,0 +1,155 @@ + +DEAL::0.00000 1.00000 0.00000 +DEAL:mass_preconditioner_setup::applied +DEAL:mass_preconditioner_setup::applied +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL:cg::Starting value 0.00144957 +DEAL:cg::Convergence step 1 value 3.06659e-19 +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL:cg::Starting value 0.00144957 +DEAL:cg::Convergence step 1 value 3.06659e-19 +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL:cg::Starting value 0.00144957 +DEAL:cg::Convergence step 1 value 3.06659e-19 +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL:cg::Starting value 0.00144957 +DEAL:cg::Convergence step 1 value 3.06659e-19 +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL:cg::Starting value 0.00144957 +DEAL:cg::Convergence step 1 value 3.06659e-19 +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL:cg::Starting value 0.00144957 +DEAL:cg::Convergence step 1 value 3.06659e-19 +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL:cg::Starting value 0.00144957 +DEAL:cg::Convergence step 1 value 3.06659e-19 +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL:cg::Starting value 0.0392202 +DEAL:cg::Convergence step 1 value 0.00000 +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL:cg::Starting value 0.0392202 +DEAL:cg::Convergence step 1 value 0.00000 +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL:cg::Starting value 0.0392202 +DEAL:cg::Convergence step 1 value 0.00000 +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL:cg::Starting value 0.0392202 +DEAL:cg::Convergence step 1 value 0.00000 +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL:cg::Starting value 0.0392202 +DEAL:cg::Convergence step 1 value 0.00000 +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL:cg::Starting value 0.0392202 +DEAL:cg::Convergence step 1 value 0.00000 +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL:cg::Starting value 0.0392202 +DEAL:cg::Convergence step 1 value 0.00000 +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::0.100000 1.00000 0.00000 +DEAL:mass_preconditioner_setup::applied +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::0.200000 1.00000 0.00000 +DEAL:mass_preconditioner_setup::applied +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL:cg::Starting value 0.104287 +DEAL:cg::Convergence step 1 value 1.96262e-17 +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL:cg::Starting value 0.104287 +DEAL:cg::Convergence step 1 value 1.96262e-17 +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL:cg::Starting value 0.104287 +DEAL:cg::Convergence step 1 value 1.96262e-17 +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL:cg::Starting value 0.104287 +DEAL:cg::Convergence step 1 value 1.96262e-17 +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL:cg::Starting value 0.104287 +DEAL:cg::Convergence step 1 value 1.96262e-17 +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL:cg::Starting value 0.104287 +DEAL:cg::Convergence step 1 value 1.96262e-17 +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL:cg::Starting value 0.104287 +DEAL:cg::Convergence step 1 value 1.96262e-17 +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL:mass_preconditioner_setup::applied +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::0.300000 1.00000 0.00000 +DEAL:mass_preconditioner_setup::applied +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::0.400000 1.00000 0.00000 +DEAL:mass_preconditioner_setup::applied +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::0.500000 1.00000 0.00000 +DEAL:mass_preconditioner_setup::applied +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::0.600000 1.00000 0.00000 +DEAL:mass_preconditioner_setup::applied +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::0.700000 1.00000 0.00000 +DEAL:mass_preconditioner_setup::applied +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::0.800000 1.00000 0.00000 +DEAL:mass_preconditioner_setup::applied +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::0.900000 1.00000 0.00000 +DEAL:mass_preconditioner_setup::applied +DEAL::Reporting recoverable failure when solving with the mass matrix. +DEAL::1.00000 1.00000 0.00000 -- 2.39.5