pybamm-team#1048 added EC-EMC electrolyte

brosaplanella · Jun 23, 2020 · 449b515 · 449b515
1 parent 24ed701
commit 449b515
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 46 deletions.
diff --git a/...ium-ion/electrolytes/lipf6_EC_DMC_1_1_Landesfeind2019/electrolyte_base_Landesfeind2019.py b/...ium-ion/electrolytes/lipf6_EC_DMC_1_1_Landesfeind2019/electrolyte_base_Landesfeind2019.py
@@ -38,31 +38,20 @@ 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
     T: :class:`pybamm.Symbol`
         Dimensional temperature
     coeffs: :class:`pybamm.Symbol`
         Fitting parameter coefficients
-<<<<<<< HEAD
-
-=======
->>>>>>> #1048 fixed EC-DMC electrolyte
     Returns
     -------
     :class:`pybamm.Symbol`
@@ -82,31 +71,20 @@ 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
     T: :class:`pybamm.Symbol`
         Dimensional temperature
     coeffs: :class:`pybamm.Symbol`
         Fitting parameter coefficients
-<<<<<<< HEAD
-
-=======
->>>>>>> #1048 fixed EC-DMC electrolyte
     Returns
     -------
     :class:`pybamm.Symbol`
@@ -133,31 +111,20 @@ 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
     T: :class:`pybamm.Symbol`
         Dimensional temperature
     coeffs: :class:`pybamm.Symbol`
         Fitting parameter coefficients
-<<<<<<< HEAD
-
-=======
->>>>>>> #1048 fixed EC-DMC electrolyte
     Returns
     -------
     :class:`pybamm.Symbol`

diff --git a/...ium-ion/electrolytes/lipf6_EC_EMC_3_7_Landesfeind2019/electrolyte_base_Landesfeind2019.py b/...ium-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/...s/lipf6_EC_EMC_3_7_Landesfeind2019/electrolyte_conductivity_EC_EMC_3_7_Landesfeind2019.py b/...s/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/...es/lipf6_EC_EMC_3_7_Landesfeind2019/electrolyte_diffusivity_EC_EMC_3_7_Landesfeind2019.py b/...es/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/..._EC_EMC_3_7_Landesfeind2019/electrolyte_transference_number_EC_EMC_3_7_Landesfeind2019.py b/..._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`