fix test

Author: aabills

pybamm/models/full_battery_models/lithium_ion/electrode_soh.py

@@ -244,6 +244,16 @@ def solve(self, inputs):
                 raise split_error
 
         sol_dict = {key: sol[key].data[0] for key in sol.all_models[0].variables.keys()}
+
+        # Calculate theoretical energy
+        x_0 = sol_dict["x_0"]
+        y_0 = sol_dict["y_0"]
+        x_100 = sol_dict["x_100"]
+        y_100 = sol_dict["y_100"]
+        energy = pybamm.lithium_ion.electrode_soh.theoretical_energy_integral(
+            self.parameter_values, x_100, x_0, y_100, y_0
+        )
+        sol_dict.update({"Maximum theoretical energy [W.h]": energy})
         return sol_dict
 
     def _set_up_solve(self, inputs):
@@ -622,7 +632,9 @@ def calculate_theoretical_energy(
         The total energy of the cell in Wh
     """
     # Get initial and final stoichiometric values.
-    n_i, p_i = get_initial_stoichiometries(initial_soc, parameter_values)
-    n_f, p_f = get_initial_stoichiometries(final_soc, parameter_values)
-    E = theoretical_energy_integral(parameter_values, n_i, n_f, p_i, p_f, points=points)
+    x_100, y_100 = get_initial_stoichiometries(initial_soc, parameter_values)
+    x_0, y_0 = get_initial_stoichiometries(final_soc, parameter_values)
+    E = theoretical_energy_integral(
+        parameter_values, x_100, x_0, y_100, y_0, points=points
+    )
     return E

tests/unit/test_models/test_full_battery_models/test_lithium_ion/test_electrode_soh.py

@@ -31,7 +31,18 @@ def test_known_solution(self):
         ics = esoh_solver._set_up_solve(inputs)
         sol_split = esoh_solver._solve_split(inputs, ics)
         for key in sol:
-            self.assertAlmostEqual(sol[key], sol_split[key].data[0], places=5)
+            if key != "Maximum theoretical energy [W.h]":
+                self.assertAlmostEqual(sol[key], sol_split[key].data[0], places=5)
+            else:
+                # theoretical_energy is not present in sol_split
+                x_0 = sol_split["x_0"].data[0]
+                y_0 = sol_split["y_0"].data[0]
+                x_100 = sol_split["x_100"].data[0]
+                y_100 = sol_split["y_100"].data[0]
+                energy = pybamm.lithium_ion.electrode_soh.theoretical_energy_integral(
+                    parameter_values, x_100, x_0, y_100, y_0
+                )
+                self.assertAlmostEqual(sol[key], energy, places=5)
 
         # should still work with old inputs
         n_Li = parameter_values.evaluate(param.n_Li_particles_init)