#1996 some progress, but events don't work

Author: valentinsulzer

pybamm/solvers/solution.py

@@ -737,8 +737,8 @@ def __add__(self, other):
         else:
             all_ts = self.all_ts + other.all_ts
             all_ys = self.all_ys + other.all_ys
-            all_models = self.all_models + other.all_models
-            all_inputs = self.all_inputs + other.all_inputs
+        all_models = self.all_models + other.all_models
+        all_inputs = self.all_inputs + other.all_inputs
 
         new_sol = Solution(
             all_ts,

pybamm/solvers/solver_utils.py

@@ -9,16 +9,22 @@ class NoMemAllocVertcat:
     Acts like a vertcat, but does not allocate new memory.
     """
 
-    def __init__(self, xs, ys, len_x=None, len_y=None, items=None):
+    def __init__(self, xs, zs, len_x=None, len_z=None, items=None):
         self.xs = xs
-        self.ys = ys
+        self.zs = zs
         self.len_x = len_x or xs[0].shape[0]
-        self.len_y = len_y or ys[0].shape[0]
+        self.len_z = len_z or zs[0].shape[0]
         len_items = len(xs)
-        self.shape = (self.len_x + self.len_y, len_items)
+        self.shape = (self.len_x + self.len_z, len_items)
 
         if items is None:
             items = [None] * len_items
+            for idx in range(len_items):
+                out = casadi.DM.zeros((self.shape[0], 1))
+                out[: self.len_x] = self.xs[idx]
+                out[self.len_x :] = self.zs[idx]
+                items[idx] = out
+
         self.items = items
 
     def __getitem__(self, idx):
@@ -29,15 +35,7 @@ def __getitem__(self, idx):
         idx = idx[1]
         if isinstance(idx, slice):
             return NoMemAllocVertcat(
-                self.xs[idx], self.ys[idx], self.len_x, self.len_y, self.items[idx]
+                self.xs[idx], self.zs[idx], self.len_x, self.len_z, self.items[idx]
             )
         else:
-            item = self.items[idx]
-            if item is not None:
-                return item
-            else:
-                out = casadi.DM.zeros((self.shape[0], 1))
-                out[: self.len_x] = self.xs[idx]
-                out[self.len_x :] = self.ys[idx]
-                self.items[idx] = out
-                return out
+            return self.items[idx]