remove underscore

Vaibhav-Chopra-GT · Vaibhav-Chopra-GT · commit 8aca21520a3e · 2022-03-13T00:35:33.000+05:30
diff --git a/pybamm/input/parameters/lithium_ion/negative_electrodes/graphite_UMBL_Mohtat2020/parameters.csv b/pybamm/input/parameters/lithium_ion/negative_electrodes/graphite_UMBL_Mohtat2020/parameters.csv
@@ -14,7 +14,7 @@ Negative electrode active material volume fraction,0.61,Peyman MPM,rest is binde
 Negative particle radius [m],2.5E-06,Peyman MPM,
 Negative electrode Bruggeman coefficient (electrode),1.5,Peyman MPM,
 Negative electrode Bruggeman coefficient (electrolyte),1.5,Peyman MPM,
-Negative electrode transport_efficiency, 0.16,
+Negative electrode transport efficiency, 0.16,
 ,,,
 # Interfacial reactions,,,
 Negative electrode cation signed stoichiometry,-1,,no info from Peyman MPM
diff --git a/pybamm/input/parameters/lithium_ion/positive_electrodes/NMC_UMBL_Mohtat2020/parameters.csv b/pybamm/input/parameters/lithium_ion/positive_electrodes/NMC_UMBL_Mohtat2020/parameters.csv
@@ -13,7 +13,7 @@ Positive electrode active material volume fraction,0.445,Peyman MPM,rest is bind
 Positive particle radius [m],3.5E-06,Peyman MPM,
 Positive electrode Bruggeman coefficient (electrode),1.5,Peyman MPM,
 Positive electrode Bruggeman coefficient (electrolyte),1.5,Peyman MPM,
-Positive electrode transport_efficiency,0.16,
+Positive electrode transport efficiency,0.16,
 ,,,
 # Interfacial reactions,,,
 Positive electrode cation signed stoichiometry,-1,,no info from Peyman MPM
diff --git a/pybamm/input/parameters/lithium_ion/separators/separator_Mohtat2020/parameters.csv b/pybamm/input/parameters/lithium_ion/separators/separator_Mohtat2020/parameters.csv
@@ -6,4 +6,4 @@ Separator Bruggeman coefficient (electrolyte),1.5,Peyman MPM,
 Separator density [kg.m-3],397,,no info from Peyman MPM
 Separator specific heat capacity [J.kg-1.K-1],700,,no info from Peyman MPM
 Separator thermal conductivity [W.m-1.K-1],0.16,,no info from Peyman MPM
-Separator transport_efficiency , 0.25,
+Separator transport efficiency , 0.25,
diff --git a/pybamm/models/full_battery_models/base_battery_model.py b/pybamm/models/full_battery_models/base_battery_model.py
@@ -949,12 +949,12 @@ def set_external_circuit_submodel(self):
 
     def set_transport_efficiency_submodels(self):
         self.submodels[
-            "electrolyte transport_efficiency"
+            "electrolyte transport efficiency"
         ] = pybamm.transport_efficiency.Bruggeman(
             self.param, "Electrolyte", self.options
         )
         self.submodels[
-            "electrode transport_efficiency"
+            "electrode transport efficiency"
         ] = pybamm.transport_efficiency.Bruggeman(self.param, "Electrode", self.options)
 
     def set_thermal_submodel(self):
diff --git a/pybamm/models/full_battery_models/lead_acid/loqs.py b/pybamm/models/full_battery_models/lead_acid/loqs.py
@@ -102,10 +102,10 @@ def set_porosity_submodel(self):
 
     def set_transport_efficiency_submodels(self):
         self.submodels[
-            "leading-order electrolyte transport_efficiency"
+            "leading-order electrolyte transport efficiency"
         ] = pybamm.transport_efficiency.Bruggeman(self.param, "Electrolyte")
         self.submodels[
-            "leading-order electrode transport_efficiency"
+            "leading-order electrode transport efficiency"
         ] = pybamm.transport_efficiency.Bruggeman(self.param, "Electrode")
 
     def set_convection_submodel(self):
diff --git a/pybamm/models/full_battery_models/lithium_ion/spme.py b/pybamm/models/full_battery_models/lithium_ion/spme.py
@@ -75,12 +75,12 @@ def set_convection_submodel(self):
 
     def set_transport_efficiency_submodels(self):
         self.submodels[
-            "electrolyte transport_efficiency"
+            "electrolyte transport efficiency"
         ] = pybamm.transport_efficiency.Bruggeman(
             self.param, "Electrolyte", self.options, True
         )
         self.submodels[
-            "electrode transport_efficiency"
+            "electrode transport efficiency"
         ] = pybamm.transport_efficiency.Bruggeman(
             self.param, "Electrode", self.options, True
         )
diff --git a/pybamm/models/submodels/electrode/ohm/base_ohm.py b/pybamm/models/submodels/electrode/ohm/base_ohm.py
@@ -39,7 +39,7 @@ def set_boundary_conditions(self, variables):
             T_p = variables["Positive electrode temperature"]
             sigma_eff = (
                 self.param.sigma_p(T_p)
-                * variables["Positive electrode transport_efficiency"]
+                * variables["Positive electrode transport efficiency"]
             )
             rbc = (
                 i_boundary_cc / pybamm.boundary_value(-sigma_eff, "right"),
diff --git a/pybamm/models/submodels/electrode/ohm/composite_ohm.py b/pybamm/models/submodels/electrode/ohm/composite_ohm.py
@@ -40,7 +40,7 @@ def get_coupled_variables(self, variables):
         tor_0 = variables[
             "Leading-order x-averaged "
             + self.domain.lower()
-            + " electrode transport_efficiency"
+            + " electrode transport efficiency"
         ]
         phi_s_cn = variables["Negative current collector potential"]
         T = variables["X-averaged " + self.domain.lower() + " electrode temperature"]
@@ -85,7 +85,7 @@ def set_boundary_conditions(self, variables):
         tor_0 = variables[
             "Leading-order x-averaged "
             + self.domain.lower()
-            + " electrode transport_efficiency"
+            + " electrode transport efficiency"
         ]
         i_boundary_cc_0 = variables["Leading-order current collector current density"]
         T = variables["X-averaged " + self.domain.lower() + " electrode temperature"]
diff --git a/pybamm/models/submodels/electrode/ohm/full_ohm.py b/pybamm/models/submodels/electrode/ohm/full_ohm.py
@@ -37,7 +37,7 @@ def get_fundamental_variables(self):
     def get_coupled_variables(self, variables):
 
         phi_s = variables[self.domain + " electrode potential"]
-        tor = variables[self.domain + " electrode transport_efficiency"]
+        tor = variables[self.domain + " electrode transport efficiency"]
         T = variables[self.domain + " electrode temperature"]
 
         if self.domain == "Negative":
@@ -77,7 +77,7 @@ def set_boundary_conditions(self, variables):
 
         phi_s = variables[self.domain + " electrode potential"]
         phi_s_cn = variables["Negative current collector potential"]
-        tor = variables[self.domain + " electrode transport_efficiency"]
+        tor = variables[self.domain + " electrode transport efficiency"]
         T = variables[self.domain + " electrode temperature"]
 
         if self.domain == "Negative":
diff --git a/pybamm/models/submodels/electrode/ohm/surface_form_ohm.py b/pybamm/models/submodels/electrode/ohm/surface_form_ohm.py
@@ -33,7 +33,7 @@ def get_coupled_variables(self, variables):
         x_p = pybamm.standard_spatial_vars.x_p
         i_boundary_cc = variables["Current collector current density"]
         i_e = variables[self.domain + " electrolyte current density"]
-        tor = variables[self.domain + " electrode transport_efficiency"]
+        tor = variables[self.domain + " electrode transport efficiency"]
         phi_s_cn = variables["Negative current collector potential"]
         T = variables[self.domain + " electrode temperature"]
 
diff --git a/pybamm/models/submodels/electrolyte_conductivity/composite_conductivity.py b/pybamm/models/submodels/electrolyte_conductivity/composite_conductivity.py
@@ -50,15 +50,15 @@ def get_coupled_variables(self, variables):
             ]
             phi_s_n_av = variables["X-averaged negative electrode potential"]
             tor_n_av = variables[
-                "Leading-order x-averaged negative electrolyte transport_efficiency"
+                "Leading-order x-averaged negative electrolyte transport efficiency"
             ]
 
         c_e_s = variables["Separator electrolyte concentration"]
         c_e_p = variables["Positive electrolyte concentration"]
 
-        tor_s_av = variables["Leading-order x-averaged separator transport_efficiency"]
+        tor_s_av = variables["Leading-order x-averaged separator transport efficiency"]
         tor_p_av = variables[
-            "Leading-order x-averaged positive electrolyte transport_efficiency"
+            "Leading-order x-averaged positive electrolyte transport efficiency"
         ]
 
         T_av = variables["X-averaged cell temperature"]
diff --git a/pybamm/models/submodels/electrolyte_conductivity/full_conductivity.py b/pybamm/models/submodels/electrolyte_conductivity/full_conductivity.py
@@ -38,7 +38,7 @@ def get_fundamental_variables(self):
     def get_coupled_variables(self, variables):
         param = self.param
         T = variables["Cell temperature"]
-        tor = variables["Electrolyte transport_efficiency"]
+        tor = variables["Electrolyte transport efficiency"]
         c_e = variables["Electrolyte concentration"]
         phi_e = variables["Electrolyte potential"]
 
diff --git a/pybamm/models/submodels/electrolyte_conductivity/integrated_conductivity.py b/pybamm/models/submodels/electrolyte_conductivity/integrated_conductivity.py
@@ -50,9 +50,9 @@ def get_coupled_variables(self, variables):
         ]
         phi_s_n_av = variables["X-averaged negative electrode potential"]
 
-        tor_n = variables["Negative electrolyte transport_efficiency"]
-        tor_s = variables["Separator transport_efficiency"]
-        tor_p = variables["Positive electrolyte transport_efficiency"]
+        tor_n = variables["Negative electrolyte transport efficiency"]
+        tor_s = variables["Separator transport efficiency"]
+        tor_p = variables["Positive electrolyte transport efficiency"]
 
         T_av = variables["X-averaged cell temperature"]
         T_av_n = pybamm.PrimaryBroadcast(T_av, "negative electrode")
diff --git a/pybamm/models/submodels/electrolyte_conductivity/surface_potential_form/full_surface_form_conductivity.py b/pybamm/models/submodels/electrolyte_conductivity/surface_potential_form/full_surface_form_conductivity.py
@@ -123,8 +123,8 @@ def get_coupled_variables(self, variables):
 
     def _get_conductivities(self, variables):
         param = self.param
-        tor_e = variables[self.domain + " electrolyte transport_efficiency"]
-        tor_s = variables[self.domain + " electrode transport_efficiency"]
+        tor_e = variables[self.domain + " electrolyte transport efficiency"]
+        tor_s = variables[self.domain + " electrode transport efficiency"]
         c_e = variables[self.domain + " electrolyte concentration"]
         T = variables[self.domain + " electrode temperature"]
         if self.domain == "Negative":
diff --git a/pybamm/models/submodels/electrolyte_diffusion/composite_diffusion.py b/pybamm/models/submodels/electrolyte_diffusion/composite_diffusion.py
@@ -34,7 +34,7 @@ def get_fundamental_variables(self):
 
     def get_coupled_variables(self, variables):
 
-        tor_0 = variables["Leading-order electrolyte transport_efficiency"]
+        tor_0 = variables["Leading-order electrolyte transport efficiency"]
         eps = variables["Leading-order porosity"]
         c_e_0_av = variables["Leading-order x-averaged electrolyte concentration"]
         c_e = variables["Electrolyte concentration"]
diff --git a/pybamm/models/submodels/electrolyte_diffusion/first_order_diffusion.py b/pybamm/models/submodels/electrolyte_diffusion/first_order_diffusion.py
@@ -40,11 +40,11 @@ def get_coupled_variables(self, variables):
         eps_s_0 = variables["Leading-order x-averaged separator porosity"]
         eps_p_0 = variables["Leading-order x-averaged positive electrode porosity"]
         tor_n_0 = variables[
-            "Leading-order x-averaged negative electrolyte transport_efficiency"
+            "Leading-order x-averaged negative electrolyte transport efficiency"
         ]
-        tor_s_0 = variables["Leading-order x-averaged separator transport_efficiency"]
+        tor_s_0 = variables["Leading-order x-averaged separator transport efficiency"]
         tor_p_0 = variables[
-            "Leading-order x-averaged positive electrolyte transport_efficiency"
+            "Leading-order x-averaged positive electrolyte transport efficiency"
         ]
         deps_n_0_dt = variables[
             "Leading-order x-averaged negative electrode porosity change"
diff --git a/pybamm/models/submodels/electrolyte_diffusion/full_diffusion.py b/pybamm/models/submodels/electrolyte_diffusion/full_diffusion.py
@@ -60,7 +60,7 @@ def get_coupled_variables(self, variables):
 
         eps_c_e = variables["Porosity times concentration"]
         c_e = variables["Electrolyte concentration"]
-        tor = variables["Electrolyte transport_efficiency"]
+        tor = variables["Electrolyte transport efficiency"]
         i_e = variables["Electrolyte current density"]
         v_box = variables["Volume-averaged velocity"]
         T = variables["Cell temperature"]
@@ -111,7 +111,7 @@ def set_boundary_conditions(self, variables):
             # left bc at anode/separator interface
             # assuming v_box = 0 for now
             T = variables["Cell temperature"]
-            tor = variables["Electrolyte transport_efficiency"]
+            tor = variables["Electrolyte transport efficiency"]
             i_boundary_cc = variables["Current collector current density"]
             lbc = (
                 pybamm.boundary_value(
diff --git a/pybamm/models/submodels/interface/kinetics/diffusion_limited.py b/pybamm/models/submodels/interface/kinetics/diffusion_limited.py
@@ -106,7 +106,7 @@ def _get_diffusion_limited_current_density(self, variables):
                 ]
                 j = -self.param.l_p * j_p / self.param.l_n
             elif self.order in ["composite", "full"]:
-                tor_s = variables["Separator transport_efficiency"]
+                tor_s = variables["Separator transport efficiency"]
                 c_ox_s = variables["Separator oxygen concentration"]
                 N_ox_neg_sep_interface = (
                     -pybamm.boundary_value(tor_s, "left")
diff --git a/pybamm/models/submodels/oxygen_diffusion/composite_oxygen_diffusion.py b/pybamm/models/submodels/oxygen_diffusion/composite_oxygen_diffusion.py
@@ -31,8 +31,8 @@ def __init__(self, param, extended=False):
 
     def get_coupled_variables(self, variables):
 
-        tor_0_s = variables["Leading-order separator transport_efficiency"]
-        tor_0_p = variables["Leading-order positive electrode transport_efficiency"]
+        tor_0_s = variables["Leading-order separator transport efficiency"]
+        tor_0_p = variables["Leading-order positive electrode transport efficiency"]
         tor_0 = pybamm.concatenation(tor_0_s, tor_0_p)
 
         c_ox = variables["Separator and positive electrode oxygen concentration"]
diff --git a/pybamm/models/submodels/oxygen_diffusion/first_order_oxygen_diffusion.py b/pybamm/models/submodels/oxygen_diffusion/first_order_oxygen_diffusion.py
@@ -37,10 +37,10 @@ def get_coupled_variables(self, variables):
 
         # Unpack
         tor_s_0_av = variables[
-            "Leading-order x-averaged separator transport_efficiency"
+            "Leading-order x-averaged separator transport efficiency"
         ]
         tor_p_0_av = variables[
-            "Leading-order x-averaged positive electrolyte transport_efficiency"
+            "Leading-order x-averaged positive electrolyte transport efficiency"
         ]
 
         # Diffusivities
diff --git a/pybamm/models/submodels/oxygen_diffusion/full_oxygen_diffusion.py b/pybamm/models/submodels/oxygen_diffusion/full_oxygen_diffusion.py
@@ -50,8 +50,8 @@ def get_fundamental_variables(self):
 
     def get_coupled_variables(self, variables):
 
-        tor_s = variables["Separator transport_efficiency"]
-        tor_p = variables["Positive electrode transport_efficiency"]
+        tor_s = variables["Separator transport efficiency"]
+        tor_p = variables["Positive electrode transport efficiency"]
         tor = pybamm.concatenation(tor_s, tor_p)
 
         c_ox = variables["Separator and positive electrode oxygen concentration"]
diff --git a/pybamm/models/submodels/transport_efficiency/base_transport_efficiency.py b/pybamm/models/submodels/transport_efficiency/base_transport_efficiency.py
@@ -29,28 +29,28 @@ def _get_standard_transport_efficiency_variables(
         tor = pybamm.concatenation(tor_n, tor_s, tor_p)
 
         variables = {
-            self.phase + " transport_efficiency": tor,
-            "Positive " + self.phase.lower() + " transport_efficiency": tor_p,
+            self.phase + " transport efficiency": tor,
+            "Positive " + self.phase.lower() + " transport efficiency": tor_p,
             "X-averaged positive "
             + self.phase.lower()
-            + " transport_efficiency": pybamm.x_average(tor_p),
+            + " transport efficiency": pybamm.x_average(tor_p),
         }
 
         if not self.half_cell:
             variables.update(
                 {
-                    "Negative " + self.phase.lower() + " transport_efficiency": tor_n,
+                    "Negative " + self.phase.lower() + " transport efficiency": tor_n,
                     "X-averaged negative "
                     + self.phase.lower()
-                    + " transport_efficiency": pybamm.x_average(tor_n),
+                    + " transport efficiency": pybamm.x_average(tor_n),
                 }
             )
 
         if self.phase == "Electrolyte":
             variables.update(
                 {
-                    "Separator transport_efficiency": tor_s,
-                    "X-averaged separator transport_efficiency": pybamm.x_average(
+                    "Separator transport efficiency": tor_s,
+                    "X-averaged separator transport efficiency": pybamm.x_average(
                         tor_s
                     ),
                 }

Original file line number	Diff line number	Diff line change
`@@ -75,12 +75,12 @@ def set_convection_submodel(self):`
`75`	`75`
`76`	`76`	`def set_transport_efficiency_submodels(self):`
`77`	`77`	`self.submodels[`
`78`		`- "electrolyte transport_efficiency"`
	`78`	`+ "electrolyte transport efficiency"`
`79`	`79`	`] = pybamm.transport_efficiency.Bruggeman(`
`80`	`80`	`self.param, "Electrolyte", self.options, True`
`81`	`81`	`)`
`82`	`82`	`self.submodels[`
`83`		`- "electrode transport_efficiency"`
	`83`	`+ "electrode transport efficiency"`
`84`	`84`	`] = pybamm.transport_efficiency.Bruggeman(`
`85`	`85`	`self.param, "Electrode", self.options, True`
`86`	`86`	`)`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ def set_boundary_conditions(self, variables):`
`39`	`39`	`T_p = variables["Positive electrode temperature"]`
`40`	`40`	`sigma_eff = (`
`41`	`41`	`self.param.sigma_p(T_p)`
`42`		`- * variables["Positive electrode transport_efficiency"]`
	`42`	`+ * variables["Positive electrode transport efficiency"]`
`43`	`43`	`)`
`44`	`44`	`rbc = (`
`45`	`45`	`i_boundary_cc / pybamm.boundary_value(-sigma_eff, "right"),`