Merge pull request #3871 from pybamm-team/fix-electrode-particle

fix deprecation warning and check for electrode/particle diffusivity

pybamm/util.py

@@ -58,12 +58,13 @@ def __getitem__(self, key):
         try:
             return super().__getitem__(key)
         except KeyError:
-            if "electrode diffusivity" in key:
+            if "particle diffusivity" in key:
                 warn(
-                    f"The parameter '{key}' has been renamed to '{key.replace('electrode', 'particle')}'",
+                    f"The parameter '{key.replace('particle', 'electrode')}' "
+                    f"has been renamed to '{key}'",
                     DeprecationWarning,
                 )
-                return super().__getitem__(key.replace("electrode", "particle"))
+                return super().__getitem__(key.replace("particle", "electrode"))
             if key in ["Negative electrode SOC", "Positive electrode SOC"]:
                 domain = key.split(" ")[0]
                 raise KeyError(

tests/unit/test_util.py

@@ -48,7 +48,7 @@ def test_fuzzy_dict(self):
                 "SEI current": 3,
                 "Lithium plating current": 4,
                 "A dimensional variable [m]": 5,
-                "Positive particle diffusivity [m2.s-1]": 6,
+                "Positive electrode diffusivity [m2.s-1]": 6,
             }
         )
         self.assertEqual(d["test"], 1)