#775 get tom's test working (hacky)

Author: valentinsulzer

pybamm/solvers/casadi_solver.py

@@ -242,14 +242,23 @@ def integrate_casadi(self, rhs, algebraic, y0, t_eval, inputs=None):
         # set up and solve
         t = casadi.MX.sym("t")
         u = casadi.vertcat(*[x for x in inputs.values()])
-        y_diff = casadi.MX.sym("y_diff", rhs(0, y0, u).shape[0])
+        y_diff = self.y_diff
         problem = {"t": t, "x": y_diff}
         if algebraic is None:
-            problem.update({"ode": rhs(t, y_diff, u)})
+            y_casadi_w_ext = casadi.vertcat(y_diff, self.y_ext[y_diff.shape[0] :])
+            problem.update({"ode": rhs(t, y_casadi_w_ext, u)})
         else:
-            y_alg = casadi.MX.sym("y_alg", algebraic(0, y0, u).shape[0])
-            y = casadi.vertcat(y_diff, y_alg)
-            problem.update({"z": y_alg, "ode": rhs(t, y, u), "alg": algebraic(t, y, u)})
+            y_alg = self.y_alg
+            y_casadi_w_ext = casadi.vertcat(
+                y_diff, y_alg, self.y_ext[y_diff.shape[0] + y_alg.shape[0] :]
+            )
+            problem.update(
+                {
+                    "z": y_alg,
+                    "ode": rhs(t, y_casadi_w_ext, u),
+                    "alg": algebraic(t, y_casadi_w_ext, u),
+                }
+            )
         integrator = casadi.integrator("F", self.method, problem, options)
         try:
             # Try solving

pybamm/solvers/dae_solver.py

@@ -340,6 +340,8 @@ def get_event_class(event):
         self.events = model.events
         self.event_funs = [get_event_class(event) for event in casadi_events.values()]
         self.jacobian = jacobian
+        self.y_diff = y_diff
+        self.y_alg = y_alg
 
         # Save CasADi functions for the CasADi solver
         # Note: when we pass to casadi the ode part of the problem must be in explicit

pybamm/solvers/ode_solver.py

@@ -232,6 +232,8 @@ def get_event_class(event):
 
         # Add the solver attributes
         self.y0 = y0
+        self.y_diff = y_casadi
+        self.y_casadi_w_ext = y_casadi_w_ext
         self.dydt = DydtCasadi(model, concatenated_rhs_fn)
         self.events = model.events
         self.event_funs = [get_event_class(event) for event in casadi_events.values()]