Merge pull request #259 from pybamm-team/issue-258-casadi-sol

Fix issue 258

CHANGELOG.md

@@ -12,6 +12,14 @@
 
 - ([#PR](link))
 
+# [v0.3.6](https://github.com/pybamm-team/liionpack/)
+
+
+## Bug fixes
+
+- Fix a RunTimeError introduced by change to latest version of casadi that PyBaMM now supports. Solution returned by casadi no longer contains initial state. ([#259](https://github.com/pybamm-team/liionpack/pull/259))
+
+
 # [v0.3.5](https://github.com/pybamm-team/liionpack/) - 2023-04-05
 
 ## Features

environment.yml

@@ -35,4 +35,5 @@ dependencies:
     - mkdocstrings-python-legacy
     - mkdocs-material
     - mkdocs-jupyter
+    - nbconvert
     - -e .

liionpack/__init__.py

@@ -44,4 +44,4 @@
 from .solvers import GenericActor
 from .solvers import RayActor
 
-__version__ = "0.3.5"
+__version__ = "0.3.6"

liionpack/solver_utils.py

@@ -101,7 +101,7 @@ def _serial_step(model, solutions, inputs_dict, integrator, variables, t_eval, e
         ninputs = len(temp.values())
         # Call the integrator once, with the grid
         casadi_sol = integrator(x0=x0, z0=z0, p=inputs)
-        xf = casadi_sol["xf"]
+        xf = casadi.horzcat(x0, casadi_sol["xf"])
         zf = casadi_sol["zf"]
         if zf.is_empty():
             y_sol = xf
@@ -215,15 +215,15 @@ def _mapped_step(model, solutions, inputs_dict, integrator, variables, t_eval, e
     tic = timer.time()
     casadi_sol = integrator(x0=x0, z0=z0, p=inputs)
     integration_time = timer.time()
-    nt = len(t_eval)
+    nt = len(t_eval[1:])
     xf = casadi_sol["xf"]
     zf = casadi_sol["zf"]
     sol = []
     xend = []
     events_eval = []
     for i in range(N):
         start = i * nt
-        y_diff = xf[:, start : start + nt]
+        y_diff = casadi.horzcat(x0[:, i], xf[:, start : start + nt])
         if zf.is_empty():
             y_sol = y_diff
         else:

pyproject.toml

@@ -41,6 +41,7 @@ dependencies = [
     "scipy",
     "textwrapper",
     "tqdm",
+    "nbconvert",
 ]
 dynamic = [
     "version",