Skip to content

Commit 36c4be4

Browse files
#775 fix tests
1 parent c2c1199 commit 36c4be4

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

pybamm/solvers/casadi_solver.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ def integrate_casadi(self, rhs, algebraic, y0, t_eval, inputs=None):
266266
y_casadi_w_ext = casadi.vertcat(y_diff, y_ext[len(y0) :])
267267
problem.update({"ode": rhs(t, y_casadi_w_ext, u)})
268268
else:
269-
y_alg = self.y_alg
269+
y_alg = casadi.MX.sym("y_alg", algebraic(0, y0_w_ext, u).shape[0])
270270
y_casadi_w_ext = casadi.vertcat(y_diff, y_alg, y_ext[len(y0) :])
271271
problem.update(
272272
{

pybamm/solvers/dae_solver.py

-2
Original file line numberDiff line numberDiff line change
@@ -340,8 +340,6 @@ def get_event_class(event):
340340
self.events = model.events
341341
self.event_funs = [get_event_class(event) for event in casadi_events.values()]
342342
self.jacobian = jacobian
343-
self.y_diff = y_diff
344-
self.y_alg = y_alg
345343

346344
# Save CasADi functions for the CasADi solver
347345
# Note: when we pass to casadi the ode part of the problem must be in explicit

pybamm/solvers/ode_solver.py

-2
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,6 @@ def get_event_class(event):
232232

233233
# Add the solver attributes
234234
self.y0 = y0
235-
self.y_diff = y_casadi
236-
self.y_casadi_w_ext = y_casadi_w_ext
237235
self.dydt = DydtCasadi(model, concatenated_rhs_fn)
238236
self.events = model.events
239237
self.event_funs = [get_event_class(event) for event in casadi_events.values()]

tests/unit/test_solvers/test_ode_solver.py

+7-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@ def test_exceptions(self):
1414
def test_wrong_solver(self):
1515
# Create model
1616
model = pybamm.BaseModel()
17-
var = pybamm.Variable("var")
18-
model.rhs = {var: var}
19-
model.algebraic = {var: var - 1}
17+
var1 = pybamm.Variable("var1")
18+
var2 = pybamm.Variable("var2")
19+
model.rhs = {var1: var1}
20+
model.algebraic = {var2: var2 - 1}
21+
model.initial_conditions = {var1: 0, var2: 1}
22+
disc = pybamm.Discretisation()
23+
disc.process_model(model)
2024

2125
# test errors
2226
solver = pybamm.OdeSolver()

0 commit comments

Comments
 (0)