#492 don't print casadi warnings in test

Author: valentinsulzer

pybamm/solvers/casadi_solver.py

@@ -243,7 +243,6 @@ def integrate_casadi(
             "output_t0": True,
             "max_num_steps": self.max_steps,
         }
-        options.update(self.extra_options)
         if self.method == "idas":
             options["calc_ic"] = True
 
@@ -262,7 +261,7 @@ def integrate_casadi(
         try:
             # Try solving
             y0_diff, y0_alg = np.split(y0, [y_diff.shape[0]])
-            sol = integrator(x0=y0_diff, z0=y0_alg)
+            sol = integrator(x0=y0_diff, z0=y0_alg, **self.extra_options)
             y_values = np.concatenate([sol["xf"].full(), sol["zf"].full()])
             return pybamm.Solution(t_eval, y_values, None, None, "final time")
         except RuntimeError as e:

tests/unit/test_solvers/test_casadi_solver.py

@@ -51,17 +51,14 @@ def test_integrate(self):
         self.assertEqual(solution.termination, "final time")
 
     def test_integrate_failure(self):
-        # Turn off warnings to ignore sqrt error
-        warnings.simplefilter("ignore")
-
         t = casadi.MX.sym("t")
         y = casadi.MX.sym("y")
         u = casadi.MX.sym("u")
         sqrt_decay = -np.sqrt(y)
 
         y0 = np.array([1])
         t_eval = np.linspace(0, 3, 100)
-        solver = pybamm.CasadiSolver()
+        solver = pybamm.CasadiSolver(regularity_check=False)
         rhs = casadi.Function("rhs", [t, y, u], [sqrt_decay])
         # Expect solver to fail when y goes negative
         with self.assertRaises(pybamm.SolverError):
@@ -84,21 +81,16 @@ def test_integrate_failure(self):
         disc = pybamm.Discretisation(mesh, spatial_methods)
         disc.process_model(model)
         # Solve with failure at t=2
-        solver = pybamm.CasadiSolver(rtol=1e-8, atol=1e-8, method="idas")
         t_eval = np.linspace(0, 20, 100)
         with self.assertRaises(pybamm.SolverError):
             solver.solve(model, t_eval)
         # Solve with failure at t=0
         model.initial_conditions = {var: 0}
         disc.process_model(model)
-        solver = pybamm.CasadiSolver(rtol=1e-8, atol=1e-8, method="idas")
         t_eval = np.linspace(0, 20, 100)
         with self.assertRaises(pybamm.SolverError):
             solver.solve(model, t_eval)
 
-        # Turn warnings back on
-        warnings.simplefilter("default")
-
     def test_bad_mode(self):
         with self.assertRaisesRegex(ValueError, "invalid mode"):
             pybamm.CasadiSolver(mode="bad mode")