diff --git a/pybamm/simulation.py b/pybamm/simulation.py index 612fb07a9a..ec9f04aada 100644 --- a/pybamm/simulation.py +++ b/pybamm/simulation.py @@ -81,11 +81,6 @@ def __init__( current = self._parameter_values.get("Current function [A]") if isinstance(current, pybamm.Interpolant): self.operating_mode = "drive cycle" - elif isinstance(current, tuple): - raise NotImplementedError( - "Drive cycle from data has been deprecated. " - + "Define an Interpolant instead." - ) else: self.operating_mode = "without experiment" if C_rate: diff --git a/pybamm/util.py b/pybamm/util.py index 05bdcdca77..f83c0f14b7 100644 --- a/pybamm/util.py +++ b/pybamm/util.py @@ -57,17 +57,6 @@ def __getitem__(self, key): try: return super().__getitem__(key) except KeyError: - if "negative electrode sei" in key.lower(): - raise KeyError( - f"'{key}' not found. All SEI parameters have been " - "renamed from '...negative electrode SEI...' to '...SEI...'" - ) - if "negative electrode lithium plating" in key.lower(): - raise KeyError( - f"'{key}' not found. All lithium plating parameters have been " - "renamed from '...negative electrode lithium plating...' " - "to '...lithium plating...'" - ) best_matches = self.get_best_matches(key) raise KeyError(f"'{key}' not found. Best matches are {best_matches}") diff --git a/tests/unit/test_simulation.py b/tests/unit/test_simulation.py index bf501ae91e..45db6d4e0b 100644 --- a/tests/unit/test_simulation.py +++ b/tests/unit/test_simulation.py @@ -388,14 +388,6 @@ def test_create_gif(self): os.remove("plot.gif") - def test_drive_cycle_data(self): - model = pybamm.lithium_ion.SPM() - param = model.default_parameter_values - param["Current function [A]"] = "[current data]US06" - - with self.assertRaisesRegex(NotImplementedError, "Drive cycle from data"): - pybamm.Simulation(model, parameter_values=param) - def test_drive_cycle_interpolant(self): model = pybamm.lithium_ion.SPM() param = model.default_parameter_values diff --git a/tests/unit/test_util.py b/tests/unit/test_util.py index cbae64f466..cd43b27002 100644 --- a/tests/unit/test_util.py +++ b/tests/unit/test_util.py @@ -67,16 +67,6 @@ def test_fuzzy_dict(self): self.assertEqual(d["test"], 1) with self.assertRaisesRegex(KeyError, "'test3' not found. Best matches are "): d.__getitem__("test3") - with self.assertRaisesRegex( - KeyError, "'negative electrode SEI current' not found. All SEI parameters" - ): - d.__getitem__("negative electrode SEI current") - with self.assertRaisesRegex( - KeyError, - "'negative electrode lithium plating current' not found. " - "All lithium plating parameters", - ): - d.__getitem__("negative electrode lithium plating current") def test_get_parameters_filepath(self): tempfile_obj = tempfile.NamedTemporaryFile("w", dir=".")