Merge pull request #3132 from tommaull/develop

Raise error for unknown parameter_values

CHANGELOG.md

@@ -7,6 +7,7 @@
 ## Bug fixes
 
 - Parameters in `Prada2013` have been updated to better match those given in the paper, which is a 2.3 Ah cell, instead of the mix-and-match with the 1.1 Ah cell from Lain2019.
+- Error generated when invalid parameter values are passed.
 
 # [v23.5](https://github.com/pybamm-team/PyBaMM/tree/v23.5) - 2023-06-18
 

pybamm/parameters/parameter_values.py

@@ -60,10 +60,12 @@ def __init__(self, values, chemistry=None):
             self.update(values, check_already_exists=False)
         else:
             # Check if values is a named parameter set
-            if isinstance(values, str) and values in pybamm.parameter_sets:
+            if isinstance(values, str) and values in pybamm.parameter_sets.keys():
                 values = pybamm.parameter_sets[values]
                 values.pop("chemistry", None)
                 self.update(values, check_already_exists=False)
+            else:
+                raise ValueError("Invalid Parameter Value")
 
         # Initialise empty _processed_symbols dict (for caching)
         self._processed_symbols = {}

tests/unit/test_parameters/test_parameter_values.py

@@ -41,6 +41,10 @@ def test_init(self):
         ):
             pybamm.ParameterValues(None, chemistry="lithium-ion")
 
+        # junk param values rejected
+        with self.assertRaisesRegex(ValueError, "Invalid Parameter Value"):
+            pybamm.ParameterValues("Junk")
+
     def test_repr(self):
         param = pybamm.ParameterValues({"a": 1})
         self.assertEqual(