From 2d1665012c800c8183ca79ebbeba1e7af51e2f4f Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Thu, 6 Feb 2020 14:44:36 +0000 Subject: [PATCH] #759 fixes for klu solver --- pybamm/solvers/idaklu_solver.py | 4 ++-- tests/unit/test_solvers/test_idaklu_solver.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pybamm/solvers/idaklu_solver.py b/pybamm/solvers/idaklu_solver.py index 2c5950a3f6..795f3361b8 100644 --- a/pybamm/solvers/idaklu_solver.py +++ b/pybamm/solvers/idaklu_solver.py @@ -199,12 +199,12 @@ def get_jac_col_ptrs(self): jac_class = SundialsJacobian() - num_of_events = len(model.events_eval) + num_of_events = len(model.terminate_events_eval) use_jac = 1 def rootfn(t, y): return_root = np.ones((num_of_events,)) - return_root[:] = [event(t, y) for event in model.events_eval] + return_root[:] = [event(t, y) for event in model.terminate_events_eval] return return_root diff --git a/tests/unit/test_solvers/test_idaklu_solver.py b/tests/unit/test_solvers/test_idaklu_solver.py index f6f25c0453..9683b5cbc6 100644 --- a/tests/unit/test_solvers/test_idaklu_solver.py +++ b/tests/unit/test_solvers/test_idaklu_solver.py @@ -20,7 +20,10 @@ def test_ida_roberts_klu(self): model.rhs = {u: 0.1 * v} model.algebraic = {v: 1 - v} model.initial_conditions = {u: 0, v: 1} - model.events = {"1": u - 0.2, "2": v} + model.events = [ + pybamm.Event("1", u - 0.2), + pybamm.Event("2", v), + ] disc = pybamm.Discretisation() disc.process_model(model)