#492 fix easy tests

Author: valentinsulzer

examples/scripts/compare_lead_acid.py

@@ -19,7 +19,7 @@
 models = [
     pybamm.lead_acid.LOQS(),
     # pybamm.lead_acid.FOQS(),
-    # pybamm.lead_acid.Composite(),
+    pybamm.lead_acid.Composite(),
     pybamm.lead_acid.Full(),
 ]
 

pybamm/parameters/parameter_values.py

@@ -285,21 +285,21 @@ def process_model(self, unprocessed_model, processing="process", inplace=True):
         elif processing == "update":
             processing_function = self.update_scalars
 
-        for variable, equation in unprocessed_model.rhs.items():
+        for variable, equation in model.rhs.items():
             pybamm.logger.debug(
                 "{} parameters for {!r} (rhs)".format(processing.capitalize(), variable)
             )
             model.rhs[variable] = processing_function(equation)
 
-        for variable, equation in unprocessed_model.algebraic.items():
+        for variable, equation in model.algebraic.items():
             pybamm.logger.debug(
                 "{} parameters for {!r} (algebraic)".format(
                     processing.capitalize(), variable
                 )
             )
             model.algebraic[variable] = processing_function(equation)
 
-        for variable, equation in unprocessed_model.initial_conditions.items():
+        for variable, equation in model.initial_conditions.items():
             pybamm.logger.debug(
                 "{} parameters for {!r} (initial conditions)".format(
                     processing.capitalize(), variable
@@ -313,7 +313,7 @@ def process_model(self, unprocessed_model, processing="process", inplace=True):
         # "positive tab": pos. tab bc "no tab": no tab bc}.
         new_boundary_conditions = {}
         sides = ["left", "right", "negative tab", "positive tab", "no tab"]
-        for variable, bcs in unprocessed_model.boundary_conditions.items():
+        for variable, bcs in model.boundary_conditions.items():
             processed_variable = processing_function(variable)
             new_boundary_conditions[processed_variable] = {}
             for side in sides:
@@ -337,14 +337,14 @@ def process_model(self, unprocessed_model, processing="process", inplace=True):
 
         model.boundary_conditions = new_boundary_conditions
 
-        for variable, equation in unprocessed_model.variables.items():
+        for variable, equation in model.variables.items():
             pybamm.logger.debug(
                 "{} parameters for {!r} (variables)".format(
                     processing.capitalize(), variable
                 )
             )
             model.variables[variable] = processing_function(equation)
-        for event, equation in unprocessed_model.events.items():
+        for event, equation in model.events.items():
             pybamm.logger.debug(
                 "{} parameters for event '{}''".format(processing.capitalize(), event)
             )

tests/unit/test_models/test_submodels/test_current_collector/test_composite_potential_pair.py

@@ -14,7 +14,8 @@ def test_public_functions(self):
         variables = {
             "Positive current collector potential": pybamm.PrimaryBroadcast(
                 0, "current collector"
-            )
+            ),
+            "Total current density": 0,
         }
         std_tests = tests.StandardSubModelTests(submodel, variables)
 

tests/unit/test_models/test_submodels/test_current_collector/test_homogeneous_current_collector.py

@@ -15,7 +15,8 @@ def test_public_functions(self):
         variables = {
             "Positive current collector potential": pybamm.PrimaryBroadcast(
                 0, "current collector"
-            )
+            ),
+            "Total current density": 0,
         }
         std_tests = tests.StandardSubModelTests(submodel, variables)
         std_tests.test_all()

tests/unit/test_models/test_submodels/test_current_collector/test_potential_pair.py

@@ -13,7 +13,8 @@ def test_public_functions(self):
         variables = {
             "Positive current collector potential": pybamm.PrimaryBroadcast(
                 0, "current collector"
-            )
+            ),
+            "Total current density": 0,
         }
         submodel = pybamm.current_collector.PotentialPair1plus1D(param)
         std_tests = tests.StandardSubModelTests(submodel, variables)

tests/unit/test_models/test_submodels/test_current_collector/test_set_potential_spm_1plus1d.py

@@ -20,7 +20,8 @@ def test_public_functions(self):
             "X-averaged negative electrode reaction overpotential": val,
             "X-averaged electrolyte overpotential": val,
             "X-averaged positive electrode ohmic losses": val,
-            "X-averaged negative electrode ohmic losses": val
+            "X-averaged negative electrode ohmic losses": val,
+            "Total current density": 0,
         }
         std_tests = tests.StandardSubModelTests(submodel, variables)
 
@@ -39,7 +40,8 @@ def test_public_functions(self):
             "X-averaged negative electrode reaction overpotential": val,
             "X-averaged electrolyte overpotential": val,
             "X-averaged positive electrode ohmic losses": val,
-            "X-averaged negative electrode ohmic losses": val
+            "X-averaged negative electrode ohmic losses": val,
+            "Total current density": 0,
         }
         std_tests = tests.StandardSubModelTests(submodel, variables)
 

tests/unit/test_models/test_submodels/test_external_circuit/test_current_control.py

@@ -11,7 +11,11 @@ class TestCurrentControl(unittest.TestCase):
     def test_public_functions(self):
         param = pybamm.standard_parameters_lithium_ion
         submodel = pybamm.external_circuit.CurrentControl(param)
-        std_tests = tests.StandardSubModelTests(submodel)
+        variables = {
+            "Positive current collector potential": pybamm.Scalar(0),
+            "Positive current collector potential [V]": pybamm.Scalar(0),
+        }
+        std_tests = tests.StandardSubModelTests(submodel, variables)
         std_tests.test_all()
 
 

tests/unit/test_models/test_submodels/test_external_circuit/test_function_control.py

@@ -21,9 +21,12 @@ class TestFunctionControl(unittest.TestCase):
     def test_public_functions(self):
         param = pybamm.standard_parameters_lithium_ion
         submodel = pybamm.external_circuit.FunctionControl(
-            param, ExternalCircuitFunction
+            param, ExternalCircuitFunction()
         )
-        variables = {"Terminal voltage [V]": pybamm.Scalar(0)}
+        variables = {
+            "Positive current collector potential": pybamm.Scalar(0),
+            "Positive current collector potential [V]": pybamm.Scalar(0),
+        }
         std_tests = tests.StandardSubModelTests(submodel, variables)
         std_tests.test_all()
 

tests/unit/test_models/test_submodels/test_external_circuit/test_power_control.py

@@ -11,7 +11,10 @@ class TestPowerControl(unittest.TestCase):
     def test_public_functions(self):
         param = pybamm.standard_parameters_lithium_ion
         submodel = pybamm.external_circuit.PowerFunctionControl(param)
-        variables = {"Terminal voltage [V]": pybamm.Scalar(0)}
+        variables = {
+            "Positive current collector potential": pybamm.Scalar(0),
+            "Positive current collector potential [V]": pybamm.Scalar(0),
+        }
         std_tests = tests.StandardSubModelTests(submodel, variables)
         std_tests.test_all()
 

tests/unit/test_models/test_submodels/test_external_circuit/test_voltage_control.py

@@ -11,14 +11,26 @@ class TestVoltageControl(unittest.TestCase):
     def test_public_functions(self):
         param = pybamm.standard_parameters_lithium_ion
         submodel = pybamm.external_circuit.VoltageFunctionControl(param)
-        variables = {"Terminal voltage [V]": pybamm.Scalar(0)}
+        variables = {
+            "Positive current collector potential": pybamm.Scalar(0),
+            "Positive current collector potential [V]": pybamm.Scalar(0),
+        }
         std_tests = tests.StandardSubModelTests(submodel, variables)
         std_tests.test_all()
 
     def test_public_functions_direct(self):
         param = pybamm.standard_parameters_lithium_ion
         submodel = pybamm.external_circuit.VoltageControl(param)
-        std_tests = tests.StandardSubModelTests(submodel)
+        a = pybamm.FullBroadcast(
+            0,
+            "positive electrode",
+            auxiliary_domains={"secondary": "current collector"},
+        )
+        variables = {
+            "Positive electrode potential": a,
+            "Positive electrode tortuosity": a,
+        }
+        std_tests = tests.StandardSubModelTests(submodel, variables)
         std_tests.test_all()
 
 

tests/unit/test_simulation.py

@@ -31,7 +31,9 @@ def test_basic_ops(self):
         self.assertFalse(sim._disc is None)
         for val in list(sim.built_model.rhs.values()):
             self.assertFalse(val.has_symbol_of_classes(pybamm.Parameter))
-            self.assertTrue(val.has_symbol_of_classes(pybamm.Matrix))
+            # skip test for scalar variables (e.g. discharge capacity)
+            if val.size > 1:
+                self.assertTrue(val.has_symbol_of_classes(pybamm.Matrix))
 
         sim.reset()
         sim.set_parameters()
@@ -60,7 +62,9 @@ def test_solve(self):
         self.assertFalse(sim._solution is None)
         for val in list(sim.built_model.rhs.values()):
             self.assertFalse(val.has_symbol_of_classes(pybamm.Parameter))
-            self.assertTrue(val.has_symbol_of_classes(pybamm.Matrix))
+            # skip test for scalar variables (e.g. discharge capacity)
+            if val.size > 1:
+                self.assertTrue(val.has_symbol_of_classes(pybamm.Matrix))
 
         sim.reset()
         self.assertEqual(sim.model_with_set_params, None)
@@ -76,7 +80,9 @@ def test_solve(self):
         sim.solve(check_model=False)
         for val in list(sim.built_model.rhs.values()):
             self.assertFalse(val.has_symbol_of_classes(pybamm.Parameter))
-            self.assertTrue(val.has_symbol_of_classes(pybamm.Matrix))
+            # skip test for scalar variables (e.g. discharge capacity)
+            if val.size > 1:
+                self.assertTrue(val.has_symbol_of_classes(pybamm.Matrix))
 
     def test_reuse_commands(self):
 
@@ -185,10 +191,7 @@ def test_get_variable_array(self):
         self.assertIsInstance(c_e, np.ndarray)
 
     def test_set_external_variable(self):
-        model_options = {
-            "thermal": "x-lumped",
-            "external submodels": ["thermal"],
-        }
+        model_options = {"thermal": "x-lumped", "external submodels": ["thermal"]}
         model = pybamm.lithium_ion.SPMe(model_options)
         sim = pybamm.Simulation(model)