pybamm-team#884 added integrated conductivity model

brosaplanella · Jun 23, 2020 · 8dc661f · 8dc661f
1 parent a92fcf8
commit 8dc661f
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pybamm/models/submodels/electrolyte_conductivity/integrated_conductivity.py b/pybamm/models/submodels/electrolyte_conductivity/integrated_conductivity.py
@@ -43,7 +43,11 @@ def get_coupled_variables(self, variables):
 
         tor_n = variables["Negative electrolyte tortuosity"]
         tor_s = variables["Separator tortuosity"]
+<<<<<<< HEAD
         tor_p = variables["Positive electrolyte tortuosity"]
+=======
+        tor_p = variables["Positive electrolyte tortuosity"]        
+>>>>>>> #884 added integrated conductivity model
 
         T_av = variables["X-averaged cell temperature"]
         T_av_n = pybamm.PrimaryBroadcast(T_av, "negative electrode")