From 43802af74b28e093c075ef027b59b4d697c0d189 Mon Sep 17 00:00:00 2001 From: Valentin Sulzer Date: Wed, 15 Jan 2025 12:14:41 -0500 Subject: [PATCH 1/2] don't get esoh solver for any non-lithium-ion model --- src/pybamm/simulation.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pybamm/simulation.py b/src/pybamm/simulation.py index 7bd1e5eea0..2635374579 100644 --- a/src/pybamm/simulation.py +++ b/src/pybamm/simulation.py @@ -1022,8 +1022,7 @@ def step( def _get_esoh_solver(self, calc_esoh): if ( calc_esoh is False - or isinstance(self._model, pybamm.lead_acid.BaseModel) - or isinstance(self._model, pybamm.equivalent_circuit.Thevenin) + or not isinstance(self._model, pybamm.lithium_ion.BaseModel) or self._model.options["working electrode"] != "both" ): return None From 435b9e9730e6e24bda6ceff725ff82aa1e3ad1e3 Mon Sep 17 00:00:00 2001 From: Valentin Sulzer Date: Thu, 16 Jan 2025 14:37:23 -0500 Subject: [PATCH 2/2] exclude composite simulations from esoh calcs --- src/pybamm/simulation.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pybamm/simulation.py b/src/pybamm/simulation.py index 2635374579..24ae029032 100644 --- a/src/pybamm/simulation.py +++ b/src/pybamm/simulation.py @@ -1023,6 +1023,7 @@ def _get_esoh_solver(self, calc_esoh): if ( calc_esoh is False or not isinstance(self._model, pybamm.lithium_ion.BaseModel) + or self._model.options["particle phases"] not in ["1", ("1", "1")] or self._model.options["working electrode"] != "both" ): return None