#1429 fix some tests

pybamm-team · Mar 17, 2021 · e4e9d40 · e4e9d40
1 parent cd2ffcd
commit e4e9d40
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pybamm/spatial_methods/finite_volume.py b/pybamm/spatial_methods/finite_volume.py
@@ -1376,7 +1376,7 @@ def harmonic_mean(array):
                 raise ValueError("shift key '{}' not recognised".format(shift_key))
 
         # If discretised_symbol evaluates to number there is no need to average
-        if discretised_symbol.evaluates_to_number():
+        if discretised_symbol.size == 1:
             out = discretised_symbol
         elif method == "arithmetic":
             out = arithmetic_mean(discretised_symbol)

diff --git a/tests/unit/test_discretisations/test_discretisation.py b/tests/unit/test_discretisations/test_discretisation.py
@@ -432,7 +432,7 @@ def test_process_complex_expression(self):
         scal2 = pybamm.Scalar(2)
         scal3 = pybamm.Scalar(3)
         scal4 = pybamm.Scalar(4)
-        expression = (scal1 * (scal3 + var2)) / ((var1 - scal4) + scal2)
+        expression = (scal1 * (scal3 ** var2)) / ((var1 - scal4) + scal2)
 
         # create discretisation
         disc = get_discretisation_for_testing()
@@ -443,7 +443,7 @@ def test_process_complex_expression(self):
         # left side
         self.assertIsInstance(exp_disc.children[0], pybamm.Multiplication)
         self.assertIsInstance(exp_disc.children[0].children[0], pybamm.Scalar)
-        self.assertIsInstance(exp_disc.children[0].children[1], pybamm.Addition)
+        self.assertIsInstance(exp_disc.children[0].children[1], pybamm.Power)
         self.assertTrue(
             isinstance(exp_disc.children[0].children[1].children[0], pybamm.Scalar)
         )

diff --git a/tests/unit/test_parameters/test_parameter_values.py b/tests/unit/test_parameters/test_parameter_values.py
@@ -627,15 +627,15 @@ def test_process_complex_expression(self):
         par2 = pybamm.Parameter("par2")
         scal1 = pybamm.Scalar(3)
         scal2 = pybamm.Scalar(4)
-        expression = (scal1 * (par1 + var2)) / ((var1 - par2) + scal2)
+        expression = (scal1 * (par1 ** var2)) / ((var1 - par2) + scal2)
 
         param = pybamm.ParameterValues(values={"par1": 1, "par2": 2})
         exp_param = param.process_symbol(expression)
         self.assertIsInstance(exp_param, pybamm.Division)
         # left side
         self.assertIsInstance(exp_param.children[0], pybamm.Multiplication)
         self.assertIsInstance(exp_param.children[0].children[0], pybamm.Scalar)
-        self.assertIsInstance(exp_param.children[0].children[1], pybamm.Addition)
+        self.assertIsInstance(exp_param.children[0].children[1], pybamm.Power)
         self.assertTrue(
             isinstance(exp_param.children[0].children[1].children[0], pybamm.Scalar)
         )