#853 fix tests

Author: rtimms

pybamm/solvers/casadi_solver.py

@@ -135,14 +135,11 @@ def _integrate(self, model, t_eval, inputs=None):
             t_f = t_eval[-1]
             init_event_signs = np.sign(
                 np.concatenate(
-                    [
-                        event(t, model.y0, inputs)
-                        for event in model.terminate_events_eval
-                    ]
+                    [event(t, y0, inputs) for event in model.terminate_events_eval]
                 )
             )
             pybamm.logger.info("Start solving {} with {}".format(model.name, self.name))
-            y0 = model.y0
+
             # Initialize solution
             solution = pybamm.Solution(np.array([t]), y0[:, np.newaxis])
             solution.solve_time = 0
@@ -273,6 +270,9 @@ def event_fun(t):
                     y0 = solution.y[:, -1]
             return solution
         elif self.mode == "old safe":
+            y0 = model.y0
+            if isinstance(y0, casadi.DM):
+                y0 = y0.full().flatten()
             # Step-and-check
             t = t_eval[0]
             init_event_signs = np.sign(

tests/unit/test_solvers/test_casadi_solver.py

@@ -81,8 +81,10 @@ def test_model_solver_failure(self):
         disc = pybamm.Discretisation()
         disc.process_model(model)
 
-        solver = pybamm.CasadiSolver(regularity_check=False)
-        solver_old = pybamm.CasadiSolver(mode="old safe", regularity_check=False)
+        solver = pybamm.CasadiSolver(extra_options_call={"regularity_check": False})
+        solver_old = pybamm.CasadiSolver(
+            mode="old safe", extra_options_call={"regularity_check": False}
+        )
         # Solve with failure at t=2
         t_eval = np.linspace(0, 20, 100)
         with self.assertRaises(pybamm.SolverError):