#492 tests and coverage

Author: valentinsulzer

pybamm/models/full_battery_models/lead_acid/loqs.py

@@ -57,24 +57,11 @@ def set_external_circuit_submodel(self):
         Define how the external circuit defines the boundary conditions for the model,
         e.g. (not necessarily constant-) current, voltage, etc
         """
-        if self.options["operating mode"] == "current":
-            self.submodels[
-                "leading order external circuit"
-            ] = pybamm.external_circuit.LeadingOrderCurrentControl(self.param)
-        elif self.options["operating mode"] == "voltage":
-            self.submodels[
-                "leading order external circuit"
-            ] = pybamm.external_circuit.VoltageFunctionControl(self.param)
-        elif self.options["operating mode"] == "power":
-            self.submodels[
-                "leading order external circuit"
-            ] = pybamm.external_circuit.PowerFunctionControl(self.param)
-        elif callable(self.options["operating mode"]):
-            self.submodels[
-                "leading order external circuit"
-            ] = pybamm.external_circuit.FunctionControl(
-                self.param, self.options["operating mode"]
-            )
+        super().set_external_circuit_submodel()
+        # replace 'external circuit' with 'leading-order external circuit'
+        self.submodels["leading order external circuit"] = self.submodels.pop(
+            "external circuit"
+        )
 
     def set_current_collector_submodel(self):
 

pybamm/models/submodels/external_circuit/function_control_external_circuit.py

@@ -12,9 +12,12 @@ def __init__(self, param, external_circuit_class):
         super().__init__(param)
         self.external_circuit_class = external_circuit_class
 
+    def _get_current_variable(self):
+        return pybamm.Variable("Total current density")
+
     def get_fundamental_variables(self):
         # Current is a variable
-        i_cell = pybamm.Variable("Total current density")
+        i_cell = self._get_current_variable()
         variables = self._get_current_variables(i_cell)
 
         # Add discharge capacity variable
@@ -24,9 +27,9 @@ def get_fundamental_variables(self):
         # These are not implemented yet but can be used later with the Experiment class
         # to simulate different external circuit conditions sequentially within a
         # single model (for example Constant Current - Constant Voltage)
-        for i in range(self.external_circuit_class.num_switches):
-            s = pybamm.Parameter("Switch {}".format(i + 1))
-            variables["Switch {}".format(i + 1)] = s
+        # for i in range(self.external_circuit_class.num_switches):
+        #     s = pybamm.Parameter("Switch {}".format(i + 1))
+        #     variables["Switch {}".format(i + 1)] = s
 
         return variables
 
@@ -81,26 +84,10 @@ class LeadingOrderFunctionControl(FunctionControl, LeadingOrderBaseModel):
     """External circuit with an arbitrary function, at leading order. """
 
     def __init__(self, param, external_circuit_class):
-        super().__init__(param)
-        self.external_circuit_class = external_circuit_class
-
-    def get_fundamental_variables(self):
-        # Current is a variable
-        i_cell = pybamm.Variable("Leading-order total current density")
-        variables = self._get_current_variables(i_cell)
-
-        # Add discharge capacity variable
-        variables.update(super().get_fundamental_variables())
-
-        # Add switches
-        # These are not implemented yet but can be used later with the Experiment class
-        # to simulate different external circuit conditions sequentially within a
-        # single model (for example Constant Current - Constant Voltage)
-        for i in range(self.external_circuit_class.num_switches):
-            s = pybamm.Parameter("Switch {}".format(i + 1))
-            variables["Switch {}".format(i + 1)] = s
+        super().__init__(param, external_circuit_class)
 
-        return variables
+    def _get_current_variable(self):
+        return pybamm.Variable("Leading-order total current density")
 
 
 class LeadingOrderVoltageFunctionControl(LeadingOrderFunctionControl):

tests/unit/test_models/test_full_battery_models/test_base_battery_model.py

@@ -124,6 +124,8 @@ def test_bad_options(self):
             pybamm.BaseBatteryModel({"particle": "bad particle"})
         with self.assertRaisesRegex(pybamm.OptionError, "option set external"):
             pybamm.BaseBatteryModel({"current collector": "set external potential"})
+        with self.assertRaisesRegex(pybamm.OptionError, "operating mode"):
+            pybamm.BaseBatteryModel({"operating mode": "bad operating mode"})
 
     def test_build_twice(self):
         model = pybamm.lithium_ion.SPM()  # need to pick a model to set vars and build

tests/unit/test_models/test_full_battery_models/test_lead_acid/test_loqs.py

@@ -155,6 +155,18 @@ def test_default_geometry(self):
         self.assertIn("current collector", model.default_geometry)
 
 
+class TestLeadAcidLOQSExternalCircuits(unittest.TestCase):
+    def test_well_posed_voltage(self):
+        options = {"operating mode": "voltage"}
+        model = pybamm.lead_acid.LOQS(options)
+        model.check_well_posedness()
+
+    def test_well_posed_power(self):
+        options = {"operating mode": "power"}
+        model = pybamm.lead_acid.LOQS(options)
+        model.check_well_posedness()
+
+
 if __name__ == "__main__":
     print("Add -v for more debug output")
     import sys

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

@@ -178,6 +178,18 @@ def test_particle_fast_diffusion(self):
         model.check_well_posedness()
 
 
+class TestSPMExternalCircuits(unittest.TestCase):
+    def test_well_posed_voltage(self):
+        options = {"operating mode": "voltage"}
+        model = pybamm.lithium_ion.SPM(options)
+        model.check_well_posedness()
+
+    def test_well_posed_power(self):
+        options = {"operating mode": "power"}
+        model = pybamm.lithium_ion.SPM(options)
+        model.check_well_posedness()
+
+
 if __name__ == "__main__":
     print("Add -v for more debug output")
     import sys

tests/unit/test_parameters/test_update_parameters.py

@@ -94,8 +94,14 @@ def test_update_geometry(self):
         # test on simple lead-acid model
         model1 = pybamm.lead_acid.LOQS()
         modeltest1 = tests.StandardModelTest(model1)
+        parameter_values = pybamm.ParameterValues(
+            chemistry=pybamm.parameter_sets.Sulzer2019
+        )
+        parameter_values.update({"C-rate": 0.05})
         t_eval = np.linspace(0, 0.5)
-        modeltest1.test_all(t_eval=t_eval, skip_output_tests=True)
+        modeltest1.test_all(
+            param=parameter_values, t_eval=t_eval, skip_output_tests=True
+        )
 
         T1, Y1 = modeltest1.solution.t, modeltest1.solution.y
 
@@ -105,6 +111,7 @@ def test_update_geometry(self):
         )
         parameter_values_update.update(
             {
+                "C-rate": 0.05,
                 "Negative electrode thickness [m]": 0.0002,
                 "Separator thickness [m]": 0.0003,
                 "Positive electrode thickness [m]": 0.0004,