#492 coverage for parameter values

Author: valentinsulzer

pybamm/parameters/parameter_values.py

@@ -223,8 +223,8 @@ def check_and_update_parameter_values(self, values):
                     value = CrateToCurrent(values["C-rate"], capacity)
                 elif isinstance(values["C-rate"], tuple):
                     data = values["C-rate"][1]
-                    data[:, 1] *= capacity
-                    value = (values["C-rate"][0] + "_toCrate", data)
+                    data[:, 1] = data[:, 1] * capacity
+                    value = (values["C-rate"][0] + "_to_Crate", data)
                 else:
                     value = values["C-rate"] * capacity
                 super().__setitem__("Current function [A]", value)
@@ -233,8 +233,8 @@ def check_and_update_parameter_values(self, values):
                     value = CurrentToCrate(values["Current function [A]"], capacity)
                 elif isinstance(values["Current function [A]"], tuple):
                     data = values["Current function [A]"][1]
-                    data[:, 1] /= capacity
-                    value = (values["Current function [A]"][0] + "_toCurrent", data)
+                    data[:, 1] = data[:, 1] / capacity
+                    value = (values["Current function [A]"][0] + "_to_current", data)
                 else:
                     value = values["Current function [A]"] / capacity
                 super().__setitem__("C-rate", value)

tests/unit/test_models/test_full_battery_models/test_lithium_ion/test_spm.py

@@ -199,7 +199,7 @@ def __call__(self, variables):
                 return V + I - pybamm.FunctionParameter("Function", pybamm.t)
 
         options = {"operating mode": ExternalCircuitFunction()}
-        model = pybamm.lead_acid.LOQS(options)
+        model = pybamm.lithium_ion.SPM(options)
         model.check_well_posedness()
 
 

tests/unit/test_parameters/test_parameter_values.py

@@ -86,6 +86,26 @@ def test_check_and_update_parameter_values(self):
         param = pybamm.ParameterValues(values)
         self.assertEqual(param["C-rate"](5).evaluate(), np.exp(5) / 10)
 
+        # With data
+        # if only C-rate and capacity provided, update current
+        x = np.linspace(0, 10)[:, np.newaxis]
+        linear = np.hstack([x, 2 * x])
+        values = {"C-rate": ("linear", linear), "Cell capacity [A.h]": 10}
+        param = pybamm.ParameterValues(values)
+        self.assertEqual(param["Current function [A]"][0], "linear_to_Crate")
+        np.testing.assert_array_equal(
+            param["Current function [A]"][1], np.hstack([x, 20 * x])
+        )
+        # if only current and capacity provided, update C-rate
+        x = np.linspace(0, 10)[:, np.newaxis]
+        linear = np.hstack([x, 2 * x])
+        values = {"Current function [A]": ("linear", linear), "Cell capacity [A.h]": 10}
+        param = pybamm.ParameterValues(values)
+        self.assertEqual(param["C-rate"][0], "linear_to_current")
+        np.testing.assert_array_almost_equal(
+            param["C-rate"][1], np.hstack([x, 0.2 * x])
+        )
+
     def test_process_symbol(self):
         parameter_values = pybamm.ParameterValues({"a": 1, "b": 2, "c": 3})
         # process parameter
@@ -226,6 +246,11 @@ def test_process_symbol(self):
         with self.assertRaises(NotImplementedError):
             parameter_values.process_symbol(sym)
 
+        # not found
+        with self.assertRaises(KeyError):
+            x = pybamm.Parameter("x")
+            parameter_values.process_symbol(x)
+
     def test_process_input_parameter(self):
         parameter_values = pybamm.ParameterValues({"a": "[input]", "b": 3})
         # process input parameter
@@ -461,6 +486,14 @@ def test_process_model(self):
             isinstance(model.variables["d_var1"].children[1], pybamm.Variable)
         )
 
+        # bad boundary conditions
+        model = pybamm.BaseModel()
+        model.algebraic = {var1: var1}
+        x = pybamm.Parameter("x")
+        model.boundary_conditions = {var1: {"left": (x, "Dirichlet")}}
+        with self.assertRaises(KeyError):
+            parameter_values.process_model(model)
+
     def test_process_empty_model(self):
         model = pybamm.BaseModel()
         parameter_values = pybamm.ParameterValues({"a": 1, "b": 2, "c": 3, "d": 42})

tests/unit/test_solvers/test_casadi_solver.py

@@ -6,7 +6,6 @@
 import unittest
 import numpy as np
 from tests import get_mesh_for_testing, get_discretisation_for_testing
-import warnings
 
 
 class TestCasadiSolver(unittest.TestCase):