Skip to content

Commit 751dfb2

Browse files
fix tests and update changelog
1 parent d0e7bed commit 751dfb2

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
## Bug fixes
1111

12+
- Parameter sets can now contain the key "chemistry", and will ignore its value (this previously would give errors in some cases) ([#2901](https://github.com/pybamm-team/PyBaMM/pull/2901))
1213
- Fixed a bug in the discretisation of initial conditions of a scaled variable ([#2856](https://github.com/pybamm-team/PyBaMM/pull/2856))
1314
- Fixed keyerror on "all" when getting sensitivities from IDAKLU solver([#2883](https://github.com/pybamm-team/PyBaMM/pull/2883))
1415

pybamm/parameters/parameter_values.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@ def __init__(self, values, chemistry=None):
7171
self.update_from_chemistry(values)
7272
else:
7373
# Remove chemistry if present
74-
values.pop("chemistry")
74+
values.pop("chemistry", None)
7575
self.update(values, check_already_exists=False)
7676
else:
7777
# Check if values is a named parameter set
7878
if isinstance(values, str) and values in pybamm.parameter_sets:
7979
values = pybamm.parameter_sets[values]
80-
values.pop("chemistry")
80+
values.pop("chemistry", None)
8181
self.update(values, check_already_exists=False)
8282

8383
else:

tests/unit/test_parameters/test_parameter_values.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ def test_init(self):
5656
self.assertIn("a", param.keys())
5757
self.assertIn(1, param.values())
5858

59+
# from dict "chemistry" key gets removed
60+
param = pybamm.ParameterValues({"a": 1, "chemistry": "lithium-ion"})
61+
self.assertNotIn("chemistry", param.keys())
62+
5963
# from file
6064
param = pybamm.ParameterValues(
6165
"lithium_ion/testing_only/positive_electrodes/lico2_Ai2020/parameters.csv"

0 commit comments

Comments
 (0)