#1456 changed variable, need to resolve order

Author: valentinsulzer

examples/scripts/compare_lithium_ion.py

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

pybamm/models/standard_variables.py

@@ -31,6 +31,33 @@
     bounds=(0, np.inf),
 )
 
+# Electrolyte porosity times concentration
+eps_c_e_n = pybamm.Variable(
+    "Negative electrolyte porosity times concentration",
+    domain="negative electrode",
+    auxiliary_domains={"secondary": "current collector"},
+    bounds=(0, np.inf),
+)
+eps_c_e_s = pybamm.Variable(
+    "Separator electrolyte porosity times concentration",
+    domain="separator",
+    auxiliary_domains={"secondary": "current collector"},
+    bounds=(0, np.inf),
+)
+eps_c_e_p = pybamm.Variable(
+    "Positive electrolyte porosity times concentration",
+    domain="positive electrode",
+    auxiliary_domains={"secondary": "current collector"},
+    bounds=(0, np.inf),
+)
+eps_c_e = pybamm.concatenation(eps_c_e_n, eps_c_e_s, eps_c_e_p)
+
+eps_c_e_av = pybamm.Variable(
+    "X-averaged electrolyte porosity times concentration",
+    domain="current collector",
+    bounds=(0, np.inf),
+)
+
 # Electrolyte potential
 phi_e_n = pybamm.Variable(
     "Negative electrolyte potential",

pybamm/models/submodels/electrolyte_diffusion/full_diffusion.py

@@ -25,14 +25,38 @@ def __init__(self, param):
         super().__init__(param)
 
     def get_fundamental_variables(self):
-        c_e_n = pybamm.standard_variables.c_e_n
-        c_e_s = pybamm.standard_variables.c_e_s
-        c_e_p = pybamm.standard_variables.c_e_p
+        eps_c_e_n = pybamm.standard_variables.eps_c_e_n
+        eps_c_e_s = pybamm.standard_variables.eps_c_e_s
+        eps_c_e_p = pybamm.standard_variables.eps_c_e_p
 
-        return self._get_standard_concentration_variables(c_e_n, c_e_s, c_e_p)
+        eps_c_e = pybamm.concatenation(eps_c_e_n, eps_c_e_s, eps_c_e_p)
+
+        variables = {
+            "Electrode porosity times concentration": eps_c_e,
+            "Negative electrode porosity times concentration": eps_c_e_n,
+            "Separator electrode porosity times concentration": eps_c_e_s,
+            "Positive electrode porosity times concentration": eps_c_e_p,
+        }
+
+        return variables
 
     def get_coupled_variables(self, variables):
 
+        eps_n = variables["Negative electrode porosity"]
+        eps_s = variables["Separator porosity"]
+        eps_p = variables["Positive electrode porosity"]
+        eps_c_e_n = variables["Negative electrode porosity times concentration"]
+        eps_c_e_s = variables["Separator porosity times concentration"]
+        eps_c_e_p = variables["Positive electrode porosity times concentration"]
+
+        c_e_n = eps_c_e_n / eps_n
+        c_e_s = eps_c_e_s / eps_s
+        c_e_p = eps_c_e_p / eps_p
+
+        variables.update(
+            self._get_standard_concentration_variables(c_e_n, c_e_s, c_e_p)
+        )
+
         tor = variables["Electrolyte tortuosity"]
         eps = variables["Porosity"]
         c_e = variables["Electrolyte concentration"]
@@ -58,7 +82,7 @@ def set_rhs(self, variables):
         param = self.param
 
         eps = variables["Porosity"]
-        deps_dt = variables["Porosity change"]
+        eps_c_e = variables["Electrolyte porosity times concentration"]
         c_e = variables["Electrolyte concentration"]
         N_e = variables["Electrolyte flux"]
         div_Vbox = variables["Transverse volume-averaged acceleration"]
@@ -67,20 +91,16 @@ def set_rhs(self, variables):
         source_terms = sum_s_j / self.param.gamma_e
 
         self.rhs = {
-            c_e: (1 / eps)
-            * (
-                -pybamm.div(N_e) / param.C_e
-                + source_terms
-                - c_e * deps_dt
-                - c_e * div_Vbox
-            )
+            eps_c_e: -pybamm.div(N_e) / param.C_e + source_terms - c_e * div_Vbox
         }
 
     def set_initial_conditions(self, variables):
 
-        c_e = variables["Electrolyte concentration"]
+        eps_c_e = variables["Electrolyte porosity times concentration"]
 
-        self.initial_conditions = {c_e: self.param.c_e_init}
+        self.initial_conditions = {
+            eps_c_e: self.param.epsilon_init * self.param.c_e_init
+        }
 
     def set_boundary_conditions(self, variables):