Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement Integrated electrolyte conductivity #1188

Merged
Changes from 1 commit
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
92de548
#884 added integrated conductivity model
brosaplanella Apr 22, 2020
e5d7c14
#884 debugging new submodel
brosaplanella May 16, 2020
fb667b3
#884 added integrated conductivity model
brosaplanella Apr 22, 2020
7899fdd
#884 debugging new submodel
brosaplanella May 16, 2020
7b3df30
Merge branch 'issue-884-electrolyte-integrated-conductivity' of https…
brosaplanella May 19, 2020
573db34
#884 added integrated conductivity model
brosaplanella Apr 22, 2020
eec8354
#884 debugging new submodel
brosaplanella May 16, 2020
5d7ca5d
Merge branch 'issue-884-electrolyte-integrated-conductivity' of https…
brosaplanella May 20, 2020
334dd17
flake8
brosaplanella May 20, 2020
3eb9c68
#884 added integrated conductivity model
brosaplanella Apr 22, 2020
4a3ebf7
#884 debugging new submodel
brosaplanella May 16, 2020
5c5b7fa
flake8
brosaplanella May 20, 2020
00bfd7c
added tab parameters (set to zero) so thermal model runs
brosaplanella May 21, 2020
a8496db
debugged conductivity
brosaplanella May 26, 2020
34b94f3
added new SPMe model
brosaplanella May 26, 2020
e439182
fix merge conflict
brosaplanella May 26, 2020
3ebae0b
flake8
brosaplanella May 26, 2020
5548930
#884 added integrated conductivity model
brosaplanella Apr 22, 2020
4c10748
#884 debugging new submodel
brosaplanella May 16, 2020
7e3c823
flake8
brosaplanella May 20, 2020
3f76b27
debugged conductivity
brosaplanella May 26, 2020
577f5fc
added new SPMe model
brosaplanella May 26, 2020
a39ac10
flake8
brosaplanella May 26, 2020
9d30d37
solved merge conflict
brosaplanella May 28, 2020
e7897be
#884 added integrated conductivity model
brosaplanella Apr 22, 2020
428e4aa
#884 debugging new submodel
brosaplanella May 16, 2020
e30ddf9
flake8
brosaplanella May 20, 2020
f5bef85
debugged conductivity
brosaplanella May 26, 2020
7ebf86a
added new SPMe model
brosaplanella May 26, 2020
f0aa087
flake8
brosaplanella May 26, 2020
57c856b
Merge branch 'issue-884-electrolyte-integrated-conductivity' of https…
brosaplanella Jun 10, 2020
320804b
#884 fixed the new SPMe model to work with the new geometry
brosaplanella Jun 11, 2020
bf92330
#884 added integrated conductivity model
brosaplanella Apr 22, 2020
44bdd41
#884 debugging new submodel
brosaplanella May 16, 2020
a0d17b5
flake8
brosaplanella May 20, 2020
90eb3ee
#884 added integrated conductivity model
brosaplanella Apr 22, 2020
bef6b8c
flake8
brosaplanella May 20, 2020
80dc52d
debugged conductivity
brosaplanella May 26, 2020
3866e20
added new SPMe model
brosaplanella May 26, 2020
a5c51cd
flake8
brosaplanella May 26, 2020
7b55d57
#884 debugging new submodel
brosaplanella May 16, 2020
06674fa
debugged conductivity
brosaplanella May 26, 2020
a923ca7
#884 fixed the new SPMe model to work with the new geometry
brosaplanella Jun 11, 2020
593ddd4
Merge branch 'issue-884-electrolyte-integrated-conductivity' of https…
brosaplanella Jun 22, 2020
764fcec
#884 cleaned code
brosaplanella Jun 22, 2020
96eb696
#884 added integrated conductivity model
brosaplanella Apr 22, 2020
183a765
#884 debugging new submodel
brosaplanella May 16, 2020
c0448ca
flake8
brosaplanella May 20, 2020
d790866
debugged conductivity
brosaplanella May 26, 2020
c135494
added new SPMe model
brosaplanella May 26, 2020
1cee889
flake8
brosaplanella May 26, 2020
a92fcf8
#884 fixed the new SPMe model to work with the new geometry
brosaplanella Jun 11, 2020
8dc661f
#884 added integrated conductivity model
brosaplanella Apr 22, 2020
40b12c3
flake8
brosaplanella May 20, 2020
fb4f6d9
#884 debugging new submodel
brosaplanella May 16, 2020
9e0d807
debugged conductivity
brosaplanella May 26, 2020
71d7a03
#884 cleaned code
brosaplanella Jun 22, 2020
d8108e8
#884 renamed model
brosaplanella Jun 23, 2020
4e47666
Merge branch 'issue-884-electrolyte-integrated-conductivity' of https…
brosaplanella Jun 23, 2020
6ec5ce6
#884 added integrated conductivity model
brosaplanella Apr 22, 2020
4a6874f
#884 debugging new submodel
brosaplanella May 16, 2020
b6626c0
flake8
brosaplanella May 20, 2020
93eefae
debugged conductivity
brosaplanella May 26, 2020
679ffbe
added new SPMe model
brosaplanella May 26, 2020
0a6dfd9
flake8
brosaplanella May 26, 2020
51f71c4
#884 fixed the new SPMe model to work with the new geometry
brosaplanella Jun 11, 2020
02ee792
#884 added integrated conductivity model
brosaplanella Apr 22, 2020
2b77066
flake8
brosaplanella May 20, 2020
a91053d
#884 debugging new submodel
brosaplanella May 16, 2020
7e6de9d
debugged conductivity
brosaplanella May 26, 2020
466e502
#884 cleaned code
brosaplanella Jun 22, 2020
d11e266
#884 debugging new submodel
brosaplanella May 16, 2020
a15c8d5
debugged conductivity
brosaplanella May 26, 2020
1521a3f
#884 added integrated conductivity model
brosaplanella Apr 22, 2020
73a5bfa
flake8
brosaplanella May 20, 2020
85c77e7
#884 debugging new submodel
brosaplanella May 16, 2020
3904114
debugged conductivity
brosaplanella May 26, 2020
1ae86bb
#884 cleaned code
brosaplanella Jun 22, 2020
62c52ea
#884 renamed model
brosaplanella Jun 23, 2020
9999775
Merge branch 'issue-884-electrolyte-integrated-conductivity' of https…
brosaplanella Jun 23, 2020
b55ede7
Merge branch 'develop' into issue-884-electrolyte-integrated-conducti…
brosaplanella Sep 15, 2020
dd8e174
Merge branch 'develop' into issue-884-electrolyte-integrated-conducti…
brosaplanella Oct 7, 2020
f4ba84e
#884 tidy up for merge
brosaplanella Oct 13, 2020
cf39650
#884 removed SPME_FBP (for development only)
brosaplanella Oct 13, 2020
756e093
#884 add preliminary citation
brosaplanella Oct 13, 2020
9d08f5e
#884 add test
brosaplanella Oct 13, 2020
0d19dbc
#884 removed activation energy from Nyman2008
brosaplanella Oct 13, 2020
48ca85c
Merge branch 'develop' into issue-884-electrolyte-integrated-conducti…
brosaplanella Oct 14, 2020
5eee5be
Merge branch 'develop' into issue-884-electrolyte-integrated-conducti…
brosaplanella Oct 19, 2020
e615e4a
#884 update CHANGELOG
brosaplanella Oct 19, 2020
08d191c
#884 add docs
brosaplanella Oct 19, 2020
6a89b7d
#884 removed arrhenius term
brosaplanella Oct 20, 2020
3f04c15
#884 included docstring reference
brosaplanella Oct 20, 2020
86051b9
#884 removed redundant right boundary integrals
brosaplanella Oct 20, 2020
a019e6b
#884 added SPMe tests
brosaplanella Oct 20, 2020
8341306
flake8
brosaplanella Oct 20, 2020
4890bab
#884 fixed typo in docs
brosaplanella Oct 20, 2020
f35dd26
#884 fix documentation
brosaplanella Oct 20, 2020
30ab27c
#884 added options to set integrated conductivity
brosaplanella Oct 22, 2020
6aa1bb3
#884 #1207 implemented option to choose electrolyte conductivity and …
brosaplanella Oct 23, 2020
0308466
#1207 update CHANGELOG
brosaplanella Oct 23, 2020
ddb5ac5
Merge branch 'develop' into issue-884-electrolyte-integrated-conducti…
brosaplanella Oct 23, 2020
006dc25
#884 set SPMe surface form to NotImplemented for the moment
brosaplanella Oct 23, 2020
480765f
#884 update CHANGELOG
brosaplanella Oct 23, 2020
9818f21
flake8
brosaplanella Oct 23, 2020
3afea4e
#884 removed SPMe from test_compare_outputs for surface form
brosaplanella Oct 23, 2020
8672eff
Merge branch 'develop' into issue-884-electrolyte-integrated-conducti…
brosaplanella Oct 24, 2020
e286ce0
Merge branch 'develop' into issue-884-electrolyte-integrated-conducti…
brosaplanella Oct 27, 2020
c301814
#884 fix typo CITATIONS.txt
brosaplanella Oct 27, 2020
f67357b
#884 add test citation Brosa Planella 2020
brosaplanella Nov 3, 2020
5d4bd51
#884 update citation TSPMe
brosaplanella Nov 4, 2020
49fa413
Merge branch 'develop' into issue-884-electrolyte-integrated-conducti…
brosaplanella Nov 4, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
#884 add preliminary citation
brosaplanella committed Oct 13, 2020

Verified

This commit was created on github.com and signed with GitHub’s verified signature.
commit 756e093b4856800d28068572db52d6a3872413c0
10 changes: 10 additions & 0 deletions pybamm/CITATIONS.txt
Original file line number Diff line number Diff line change
@@ -204,3 +204,13 @@ primaryClass={physics.app-ph},
year={2005},
publisher={IOP Publishing}
}

@article{brosaplanella2020TSPMe,
title={Systematic derivation and validation of reduced thermal-electrochemical for Li-ion batteries using asymptotic methods}
journal={Submitted for publication},
author={Brosa Planella, Ferran and Sheikh, Muhammad and Widanage, Dhammika W},
year={2020},
eprint={},
archivePrefix={arXiv},
primaryClass={},
}
Original file line number Diff line number Diff line change
@@ -22,6 +22,7 @@ class Integrated(BaseElectrolyteConductivity):
"""
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add reference to your paper in the docstring


def __init__(self, param, domain=None):
pybamm.citations.register("brosaplanella2020TSPMe")
super().__init__(param, domain)

def _higher_order_macinnes_function(self, x):