pybamm-team#884 debugging new submodel

brosaplanella · Jun 23, 2020 · fb4f6d9 · fb4f6d9
1 parent 40b12c3
commit fb4f6d9
Showing 1 changed file with 6 additions and 0 deletions.
diff --git 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 = (