From 449b515a6ca27f292f6f728e4be98d9e31be8fb4 Mon Sep 17 00:00:00 2001 From: Ferran Brosa Planella Date: Fri, 19 Jun 2020 20:17:22 +0200 Subject: [PATCH] #1048 added EC-EMC electrolyte --- .../electrolyte_base_Landesfeind2019.py | 33 ------------------- .../electrolyte_base_Landesfeind2019.py | 8 ----- ...conductivity_EC_EMC_3_7_Landesfeind2019.py | 2 -- ..._diffusivity_EC_EMC_3_7_Landesfeind2019.py | 2 -- ...rence_number_EC_EMC_3_7_Landesfeind2019.py | 1 - 5 files changed, 46 deletions(-) diff --git a/pybamm/input/parameters/lithium-ion/electrolytes/lipf6_EC_DMC_1_1_Landesfeind2019/electrolyte_base_Landesfeind2019.py b/pybamm/input/parameters/lithium-ion/electrolytes/lipf6_EC_DMC_1_1_Landesfeind2019/electrolyte_base_Landesfeind2019.py index bad3bc5202..922e096f89 100644 --- a/pybamm/input/parameters/lithium-ion/electrolytes/lipf6_EC_DMC_1_1_Landesfeind2019/electrolyte_base_Landesfeind2019.py +++ b/pybamm/input/parameters/lithium-ion/electrolytes/lipf6_EC_DMC_1_1_Landesfeind2019/electrolyte_base_Landesfeind2019.py @@ -38,20 +38,13 @@ def electrolyte_diffusivity_base_Landesfeind2019(c_e, T, coeffs): """ Diffusivity of LiPF6 in solvent_X as a function of ion concentration and temperature. The data comes from [1]. -<<<<<<< HEAD - -======= ->>>>>>> #1048 fixed EC-DMC electrolyte References ---------- .. [1] Landesfeind, J. and Gasteiger, H.A., 2019. Temperature and Concentration Dependence of the Ionic Transport Properties of Lithium-Ion Battery Electrolytes. Journal of The Electrochemical Society, 166(14), pp.A3079-A3097. -<<<<<<< HEAD Parameters -======= ->>>>>>> #1048 fixed EC-DMC electrolyte ---------- c_e: :class:`pybamm.Symbol` Dimensional electrolyte concentration @@ -59,10 +52,6 @@ def electrolyte_diffusivity_base_Landesfeind2019(c_e, T, coeffs): Dimensional temperature coeffs: :class:`pybamm.Symbol` Fitting parameter coefficients -<<<<<<< HEAD - -======= ->>>>>>> #1048 fixed EC-DMC electrolyte Returns ------- :class:`pybamm.Symbol` @@ -82,20 +71,13 @@ def electrolyte_TDF_base_Landesfeind2019(c_e, T, coeffs): """ Thermodynamic factor (TDF) of LiPF6 in solvent_X as a function of ion concentration and temperature. The data comes from [1]. -<<<<<<< HEAD - -======= ->>>>>>> #1048 fixed EC-DMC electrolyte References ---------- .. [1] Landesfeind, J. and Gasteiger, H.A., 2019. Temperature and Concentration Dependence of the Ionic Transport Properties of Lithium-Ion Battery Electrolytes. Journal of The Electrochemical Society, 166(14), pp.A3079-A3097. -<<<<<<< HEAD Parameters -======= ->>>>>>> #1048 fixed EC-DMC electrolyte ---------- c_e: :class:`pybamm.Symbol` Dimensional electrolyte concentration @@ -103,10 +85,6 @@ def electrolyte_TDF_base_Landesfeind2019(c_e, T, coeffs): Dimensional temperature coeffs: :class:`pybamm.Symbol` Fitting parameter coefficients -<<<<<<< HEAD - -======= ->>>>>>> #1048 fixed EC-DMC electrolyte Returns ------- :class:`pybamm.Symbol` @@ -133,20 +111,13 @@ def electrolyte_transference_number_base_Landesfeind2019(c_e, T, coeffs): """ Transference number of LiPF6 in solvent_X as a function of ion concentration and temperature. The data comes from [1]. -<<<<<<< HEAD - -======= ->>>>>>> #1048 fixed EC-DMC electrolyte References ---------- .. [1] Landesfeind, J. and Gasteiger, H.A., 2019. Temperature and Concentration Dependence of the Ionic Transport Properties of Lithium-Ion Battery Electrolytes. Journal of The Electrochemical Society, 166(14), pp.A3079-A3097. -<<<<<<< HEAD Parameters -======= ->>>>>>> #1048 fixed EC-DMC electrolyte ---------- c_e: :class:`pybamm.Symbol` Dimensional electrolyte concentration @@ -154,10 +125,6 @@ def electrolyte_transference_number_base_Landesfeind2019(c_e, T, coeffs): Dimensional temperature coeffs: :class:`pybamm.Symbol` Fitting parameter coefficients -<<<<<<< HEAD - -======= ->>>>>>> #1048 fixed EC-DMC electrolyte Returns ------- :class:`pybamm.Symbol` diff --git a/pybamm/input/parameters/lithium-ion/electrolytes/lipf6_EC_EMC_3_7_Landesfeind2019/electrolyte_base_Landesfeind2019.py b/pybamm/input/parameters/lithium-ion/electrolytes/lipf6_EC_EMC_3_7_Landesfeind2019/electrolyte_base_Landesfeind2019.py index 70946112b9..922e096f89 100644 --- a/pybamm/input/parameters/lithium-ion/electrolytes/lipf6_EC_EMC_3_7_Landesfeind2019/electrolyte_base_Landesfeind2019.py +++ b/pybamm/input/parameters/lithium-ion/electrolytes/lipf6_EC_EMC_3_7_Landesfeind2019/electrolyte_base_Landesfeind2019.py @@ -5,7 +5,6 @@ def electrolyte_conductivity_base_Landesfeind2019(c_e, T, coeffs): """ Conductivity of LiPF6 in solvent_X as a function of ion concentration and temperature. The data comes from [1]. - References ---------- .. [1] Landesfeind, J. and Gasteiger, H.A., 2019. Temperature and Concentration @@ -20,7 +19,6 @@ def electrolyte_conductivity_base_Landesfeind2019(c_e, T, coeffs): Dimensional temperature coeffs: :class:`pybamm.Symbol` Fitting parameter coefficients - Returns ------- :class:`pybamm.Symbol` @@ -40,7 +38,6 @@ def electrolyte_diffusivity_base_Landesfeind2019(c_e, T, coeffs): """ Diffusivity of LiPF6 in solvent_X as a function of ion concentration and temperature. The data comes from [1]. - References ---------- .. [1] Landesfeind, J. and Gasteiger, H.A., 2019. Temperature and Concentration @@ -55,7 +52,6 @@ def electrolyte_diffusivity_base_Landesfeind2019(c_e, T, coeffs): Dimensional temperature coeffs: :class:`pybamm.Symbol` Fitting parameter coefficients - Returns ------- :class:`pybamm.Symbol` @@ -75,7 +71,6 @@ def electrolyte_TDF_base_Landesfeind2019(c_e, T, coeffs): """ Thermodynamic factor (TDF) of LiPF6 in solvent_X as a function of ion concentration and temperature. The data comes from [1]. - References ---------- .. [1] Landesfeind, J. and Gasteiger, H.A., 2019. Temperature and Concentration @@ -90,7 +85,6 @@ def electrolyte_TDF_base_Landesfeind2019(c_e, T, coeffs): Dimensional temperature coeffs: :class:`pybamm.Symbol` Fitting parameter coefficients - Returns ------- :class:`pybamm.Symbol` @@ -117,7 +111,6 @@ def electrolyte_transference_number_base_Landesfeind2019(c_e, T, coeffs): """ Transference number of LiPF6 in solvent_X as a function of ion concentration and temperature. The data comes from [1]. - References ---------- .. [1] Landesfeind, J. and Gasteiger, H.A., 2019. Temperature and Concentration @@ -132,7 +125,6 @@ def electrolyte_transference_number_base_Landesfeind2019(c_e, T, coeffs): Dimensional temperature coeffs: :class:`pybamm.Symbol` Fitting parameter coefficients - Returns ------- :class:`pybamm.Symbol` diff --git a/pybamm/input/parameters/lithium-ion/electrolytes/lipf6_EC_EMC_3_7_Landesfeind2019/electrolyte_conductivity_EC_EMC_3_7_Landesfeind2019.py b/pybamm/input/parameters/lithium-ion/electrolytes/lipf6_EC_EMC_3_7_Landesfeind2019/electrolyte_conductivity_EC_EMC_3_7_Landesfeind2019.py index b0581eba78..1f38627f3d 100644 --- a/pybamm/input/parameters/lithium-ion/electrolytes/lipf6_EC_EMC_3_7_Landesfeind2019/electrolyte_conductivity_EC_EMC_3_7_Landesfeind2019.py +++ b/pybamm/input/parameters/lithium-ion/electrolytes/lipf6_EC_EMC_3_7_Landesfeind2019/electrolyte_conductivity_EC_EMC_3_7_Landesfeind2019.py @@ -8,7 +8,6 @@ def electrolyte_conductivity_EC_EMC_3_7_Landesfeind2019(c_e, T): """ Conductivity of LiPF6 in EC:EMC (3:7 w:w) as a function of ion concentration and temperature. The data comes from [1]. - References ---------- .. [1] Landesfeind, J. and Gasteiger, H.A., 2019. Temperature and Concentration @@ -21,7 +20,6 @@ def electrolyte_conductivity_EC_EMC_3_7_Landesfeind2019(c_e, T): Dimensional electrolyte concentration T: :class:`pybamm.Symbol` Dimensional temperature - Returns ------- :class:`pybamm.Symbol` diff --git a/pybamm/input/parameters/lithium-ion/electrolytes/lipf6_EC_EMC_3_7_Landesfeind2019/electrolyte_diffusivity_EC_EMC_3_7_Landesfeind2019.py b/pybamm/input/parameters/lithium-ion/electrolytes/lipf6_EC_EMC_3_7_Landesfeind2019/electrolyte_diffusivity_EC_EMC_3_7_Landesfeind2019.py index b8fd6ea266..249bea9a8b 100644 --- a/pybamm/input/parameters/lithium-ion/electrolytes/lipf6_EC_EMC_3_7_Landesfeind2019/electrolyte_diffusivity_EC_EMC_3_7_Landesfeind2019.py +++ b/pybamm/input/parameters/lithium-ion/electrolytes/lipf6_EC_EMC_3_7_Landesfeind2019/electrolyte_diffusivity_EC_EMC_3_7_Landesfeind2019.py @@ -8,7 +8,6 @@ def electrolyte_diffusivity_EC_EMC_3_7_Landesfeind2019(c_e, T): """ Diffusivity of LiPF6 in EC:EMC (3:7 w:w) as a function of ion concentration and temperature. The data comes from [1]. - References ---------- .. [1] Landesfeind, J. and Gasteiger, H.A., 2019. Temperature and Concentration @@ -21,7 +20,6 @@ def electrolyte_diffusivity_EC_EMC_3_7_Landesfeind2019(c_e, T): Dimensional electrolyte concentration T: :class:`pybamm.Symbol` Dimensional temperature - Returns ------- :class:`pybamm.Symbol` diff --git a/pybamm/input/parameters/lithium-ion/electrolytes/lipf6_EC_EMC_3_7_Landesfeind2019/electrolyte_transference_number_EC_EMC_3_7_Landesfeind2019.py b/pybamm/input/parameters/lithium-ion/electrolytes/lipf6_EC_EMC_3_7_Landesfeind2019/electrolyte_transference_number_EC_EMC_3_7_Landesfeind2019.py index 3e8b5407d5..b7ec692598 100644 --- a/pybamm/input/parameters/lithium-ion/electrolytes/lipf6_EC_EMC_3_7_Landesfeind2019/electrolyte_transference_number_EC_EMC_3_7_Landesfeind2019.py +++ b/pybamm/input/parameters/lithium-ion/electrolytes/lipf6_EC_EMC_3_7_Landesfeind2019/electrolyte_transference_number_EC_EMC_3_7_Landesfeind2019.py @@ -21,7 +21,6 @@ def electrolyte_transference_number_EC_EMC_3_7_Landesfeind2019(c_e, T=298.15): Dimensional electrolyte concentration T: :class:`pybamm.Symbol` Dimensional temperature - Returns ------- :class:`pybamm.Symbol`