#492 fix composite

Author: valentinsulzer

pybamm/models/full_battery_models/lead_acid/loqs.py

@@ -57,11 +57,24 @@ 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
         """
-        super().set_external_circuit_submodel()
-        # replace 'external circuit' with 'leading-order external circuit'
-        self.submodels["leading order external circuit"] = self.submodels.pop(
-            "external circuit"
-        )
+        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.LeadingOrderVoltageFunctionControl(self.param)
+        elif self.options["operating mode"] == "power":
+            self.submodels[
+                "leading order external circuit"
+            ] = pybamm.external_circuit.LeadingOrderPowerFunctionControl(self.param)
+        elif callable(self.options["operating mode"]):
+            self.submodels[
+                "leading order external circuit"
+            ] = pybamm.external_circuit.LeadingOrderFunctionControl(
+                self.param, self.options["operating mode"]
+            )
 
     def set_current_collector_submodel(self):
 

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

@@ -166,6 +166,19 @@ def test_well_posed_power(self):
         model = pybamm.lead_acid.LOQS(options)
         model.check_well_posedness()
 
+    def test_well_posed_function(self):
+        class ExternalCircuitFunction:
+            num_switches = 0
+
+            def __call__(self, variables):
+                I = variables["Current [A]"]
+                V = variables["Terminal voltage [V]"]
+                return V + I - pybamm.FunctionParameter("Function", pybamm.t)
+
+        options = {"operating mode": ExternalCircuitFunction()}
+        model = pybamm.lead_acid.LOQS(options)
+        model.check_well_posedness()
+
 
 if __name__ == "__main__":
     print("Add -v for more debug output")

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

@@ -189,6 +189,19 @@ def test_well_posed_power(self):
         model = pybamm.lithium_ion.SPM(options)
         model.check_well_posedness()
 
+    def test_well_posed_function(self):
+        class ExternalCircuitFunction:
+            num_switches = 0
+
+            def __call__(self, variables):
+                I = variables["Current [A]"]
+                V = variables["Terminal voltage [V]"]
+                return V + I - pybamm.FunctionParameter("Function", pybamm.t)
+
+        options = {"operating mode": ExternalCircuitFunction()}
+        model = pybamm.lead_acid.LOQS(options)
+        model.check_well_posedness()
+
 
 if __name__ == "__main__":
     print("Add -v for more debug output")