Skip to content

Commit

Permalink
#546 remove macinnes_tplus
Browse files Browse the repository at this point in the history
  • Loading branch information
valentinsulzer committed Apr 6, 2020
1 parent 8da375b commit ce41f00
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 21 deletions.
3 changes: 1 addition & 2 deletions examples/scripts/DFN.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@


# load model
model = pybamm.lithium_ion.DFN({"operating mode": "voltage"})
model = pybamm.lithium_ion.DFN()

# create geometry
geometry = model.default_geometry

# load parameter values and process model and geometry
param = model.default_parameter_values
param.update({"Voltage function [V]": 4.1}, check_already_exists=False)
param.process_model(model)
param.process_geometry(geometry)

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ Electrolyte conductivity [S.m-1],[function]conductivity_Gu1997,,
Darken thermodynamic factor,[function]darken_thermodynamic_factor_Chapman1968,,
Electrolyte diffusivity [m2.s-1],[function]diffusivity_Gu1997,,
Electrolyte viscosity [kg.m-1.s-1],[function]viscosity_Chapman1968,,
MacInnes t_plus function,[function]macinnes_tplus_function,,
,,,
# Other species properties,,,
Oxygen diffusivity [m2.s-1],2.1e-9,cussler2009diffusion
Expand Down
9 changes: 2 additions & 7 deletions pybamm/parameters/standard_parameters_lead_acid.py
Original file line number Diff line number Diff line change
Expand Up @@ -514,13 +514,8 @@ def kappa_e(c_e, T):
return kappa_e_dimensional(c_e_dimensional, T_ref) / kappa_scale


def t_plus_function(t_plus):
"Function of t_plus in the MacInnes equation"
# (1-2*t_plus) is for Nernst-Planck
# 2*(1-t_plus) for Stefan-Maxwell
return pybamm.FunctionParameter("MacInnes t_plus function", t_plus)


# (1-2*t_plus) is for Nernst-Planck
# 2*(1-t_plus) for Stefan-Maxwell
def chi(c_e, c_ox=0, c_hy=0):
return (
chi_dimensional(c_e_typ * c_e)
Expand Down
3 changes: 0 additions & 3 deletions pybamm/processed_variable.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,6 @@ def initialise_2D(self):
self.x_sol = first_dim_pts
self.z_sol = second_dim_pts
else:
import ipdb

ipdb.set_trace()
raise pybamm.DomainError(
"Cannot process 3D object with domain '{}' "
"and auxiliary_domains '{}'".format(self.domain, self.auxiliary_domains)
Expand Down

0 comments on commit ce41f00

Please sign in to comment.