Skip to content

Commit

Permalink
#759 fixes for klu solver
Browse files Browse the repository at this point in the history
  • Loading branch information
martinjrobins committed Feb 6, 2020
1 parent 168534f commit 2d16650
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions pybamm/solvers/idaklu_solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 4 additions & 1 deletion tests/unit/test_solvers/test_idaklu_solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 2d16650

Please sign in to comment.