#1456 compare_lithium_ion now works

Author: valentinsulzer

examples/scripts/compare_lithium_ion.py

@@ -3,14 +3,14 @@
 #
 import pybamm
 
-pybamm.set_logging_level("DEBUG")
+pybamm.set_logging_level("INFO")
 
 # load models
 models = [
-    # pybamm.lithium_ion.SPM(),
-    # pybamm.lithium_ion.SPMe(),
+    pybamm.lithium_ion.SPM(),
+    pybamm.lithium_ion.SPMe(),
     pybamm.lithium_ion.DFN(),
-    # pybamm.lithium_ion.NewmanTobias(),
+    pybamm.lithium_ion.NewmanTobias(),
 ]
 
 # create and run simulations

pybamm/expression_tree/binary_operators.py

@@ -1192,7 +1192,10 @@ def simplified_matrix_multiplication(left, right):
         if right.right.evaluates_to_constant_number():
             r_left, r_right = right.orphans
             new_left = left / r_right
-            return new_left @ r_left
+            new_mul = new_left @ r_left
+            # Keep the domain of the old left
+            new_mul.copy_domains(left)
+            return new_mul
 
     # Simplify A @ (B @ c) to (A @ B) @ c if (A @ B) is constant
     # This is a common construction that appears from discretisation of spatial

pybamm/models/submodels/electrolyte_diffusion/full_diffusion.py

@@ -53,13 +53,12 @@ def get_coupled_variables(self, variables):
         c_e_s = eps_c_e_s / eps_s
         c_e_p = eps_c_e_p / eps_p
 
-        eps = variables["Porosity"]
-        c_e = variables["Porosity times concentration"] / eps
         variables.update(
             self._get_standard_concentration_variables(c_e_n, c_e_s, c_e_p)
         )
-        variables["Electrolyte concentration"] = c_e
 
+        eps = variables["Porosity"]
+        c_e = variables["Electrolyte concentration"]
         tor = variables["Electrolyte tortuosity"]
         i_e = variables["Electrolyte current density"]
         v_box = variables["Volume-averaged velocity"]
@@ -82,7 +81,6 @@ def set_rhs(self, variables):
 
         param = self.param
 
-        eps = variables["Porosity"]
         eps_c_e = variables["Porosity times concentration"]
         c_e = variables["Electrolyte concentration"]
         N_e = variables["Electrolyte flux"]
@@ -106,17 +104,10 @@ def set_initial_conditions(self, variables):
     def set_boundary_conditions(self, variables):
 
         c_e = variables["Electrolyte concentration"]
-        c_e_n = variables["Negative electrolyte concentration"]
-        c_e_s = variables["Separator electrolyte concentration"]
-        c_e_p = variables["Positive electrolyte concentration"]
 
         self.boundary_conditions = {
             c_e: {
                 "left": (pybamm.Scalar(0), "Neumann"),
                 "right": (pybamm.Scalar(0), "Neumann"),
             },
-            pybamm.concatenation(c_e_n, c_e_s, c_e_p): {
-                "left": (pybamm.Scalar(0), "Neumann"),
-                "right": (pybamm.Scalar(0), "Neumann"),
-            },
         }