From fb4f6d9383746bd72419b1ee2cdc23bdbfaba6ca Mon Sep 17 00:00:00 2001 From: Ferran Brosa Planella Date: Sat, 16 May 2020 17:23:08 +0200 Subject: [PATCH] #884 debugging new submodel --- .../electrolyte_conductivity/integrated_conductivity.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pybamm/models/submodels/electrolyte_conductivity/integrated_conductivity.py b/pybamm/models/submodels/electrolyte_conductivity/integrated_conductivity.py index 099c605855..8ac8c86df8 100644 --- a/pybamm/models/submodels/electrolyte_conductivity/integrated_conductivity.py +++ b/pybamm/models/submodels/electrolyte_conductivity/integrated_conductivity.py @@ -152,9 +152,15 @@ def get_coupled_variables(self, variables): - integral_p ) +<<<<<<< HEAD # phi_e_n = 1 * phi_e_n + 10 # phi_e_s = 1 * phi_e_s + 10 # phi_e_p = 1 * phi_e_p + 10 +======= + # phi_e_n = 0 * phi_e_n + # phi_e_s = 0 * phi_e_s + # phi_e_p = 0 * phi_e_p +>>>>>>> #884 debugging new submodel # concentration overpotential eta_c_av = (