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

Composite release parameters #2248

Merged
merged 75 commits into from
Aug 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
de46a2e
making composite release branch without silicon parameters added
valentinsulzer Jun 28, 2022
3c1c51b
working on tests
valentinsulzer Jun 28, 2022
e814d0e
style
valentinsulzer Jun 29, 2022
dfdb1bc
Merge branch 'develop' into composite-release-parameters
valentinsulzer Jul 1, 2022
c30390f
remove duplication
valentinsulzer Jul 1, 2022
b759ebd
merge 2026
valentinsulzer Jul 6, 2022
aae977e
rename variables with {phase} and add param.prim
valentinsulzer Jul 6, 2022
af7d2a2
merge 20226
valentinsulzer Jul 6, 2022
298b0b8
merge develop
valentinsulzer Jul 7, 2022
235a0b5
fixing tests
valentinsulzer Jul 8, 2022
1942deb
minor bug fixes
valentinsulzer Jul 8, 2022
a5e813e
flake8
valentinsulzer Jul 8, 2022
86c9e06
merge changes from other branch
valentinsulzer Jul 8, 2022
f4b6030
merge develop
valentinsulzer Jul 12, 2022
64ff67d
fix print_name and remove tests accidentally added
valentinsulzer Jul 12, 2022
e730132
Merge branch 'variable-renaming-for-composite-release' into composite…
valentinsulzer Jul 12, 2022
4ad1648
merge particle submodel changes
valentinsulzer Jul 17, 2022
deb980b
merge combine-particle-models again
valentinsulzer Jul 17, 2022
6d75d95
merge develop and fix spm test
valentinsulzer Jul 22, 2022
8e356dd
more test fixes
valentinsulzer Jul 22, 2022
1afa5ba
working on print_name
valentinsulzer Jul 24, 2022
f379faa
Merge branch 'develop' into variable-renaming-for-composite-release
valentinsulzer Jul 26, 2022
58b8413
Merge branch 'develop' into variable-renaming-for-composite-release
valentinsulzer Jul 26, 2022
b5e3dc5
merge develop
valentinsulzer Jul 29, 2022
550f433
unit tests
valentinsulzer Jul 29, 2022
9c3e2f6
Merge branch 'variable-renaming-for-composite-release' into composite…
valentinsulzer Aug 1, 2022
df9c582
Fix tests
priyanshuone6 Aug 1, 2022
5782ec0
Add more print names
priyanshuone6 Aug 1, 2022
591127a
Fix tests
priyanshuone6 Aug 1, 2022
a4805ca
flake8
priyanshuone6 Aug 1, 2022
735ab9f
remove init to be in line with develop
valentinsulzer Aug 3, 2022
9bed190
test fix?
valentinsulzer Aug 3, 2022
2aa5830
Merge branch 'variable-renaming-for-composite-release' into composite…
valentinsulzer Aug 3, 2022
56c989b
debugging
valentinsulzer Aug 3, 2022
a45476a
Merge branch 'develop' into variable-renaming-for-composite-release
valentinsulzer Aug 3, 2022
4713907
merge develop
valentinsulzer Aug 11, 2022
9195a6e
Merge branch 'variable-renaming-for-composite-release' into composite…
valentinsulzer Aug 11, 2022
cbabe83
SPM with two phases builds
valentinsulzer Aug 11, 2022
5d472b6
all lithium-ion models run with composite graphite/graphite
valentinsulzer Aug 11, 2022
d0ac36f
fix tests
valentinsulzer Aug 11, 2022
40c1850
fix test
valentinsulzer Aug 15, 2022
7c26835
revert lead-acid example
valentinsulzer Aug 15, 2022
7cff6ea
Merge branch 'variable-renaming-for-composite-release' into composite…
valentinsulzer Aug 15, 2022
dd859e9
merge develop
valentinsulzer Aug 15, 2022
6b7dfbe
fix integration tests
valentinsulzer Aug 16, 2022
273d0dd
change to domain-specific j_scale
valentinsulzer Aug 16, 2022
7174270
merge simplified kinetics scaling
valentinsulzer Aug 16, 2022
8d2b167
Merge branch 'variable-renaming-for-composite-release' into composite…
valentinsulzer Aug 16, 2022
8781f29
revert j_scale change
valentinsulzer Aug 16, 2022
dbf7d14
Merge branch 'variable-renaming-for-composite-release' into composite…
valentinsulzer Aug 16, 2022
a19f2f6
flake8
valentinsulzer Aug 16, 2022
120b2b4
fix tests
valentinsulzer Aug 17, 2022
9d3311e
Merge branch 'variable-renaming-for-composite-release' into composite…
valentinsulzer Aug 17, 2022
98be82c
debugging composite graphite-graphite
valentinsulzer Aug 17, 2022
ba91d5e
merge rhs-and-bc-variables and fix bc bug
valentinsulzer Aug 18, 2022
591a9ed
add tests for two phases
valentinsulzer Aug 18, 2022
fe2e211
revert some unneeded changes, fix flake8 and changelog
valentinsulzer Aug 18, 2022
788539c
Merge branch 'develop' into composite-release-parameters
valentinsulzer Aug 18, 2022
d2bc3c1
add parameter back to Prada2013
valentinsulzer Aug 18, 2022
ad617f5
fix U_ref bug, working on coverage
valentinsulzer Aug 19, 2022
1cf37f1
more coverage improvements
valentinsulzer Aug 19, 2022
4f17b00
fix examples
valentinsulzer Aug 22, 2022
9251641
merge develop and fix example
valentinsulzer Aug 22, 2022
109aae0
coverage
valentinsulzer Aug 22, 2022
79b6fe4
coverage
valentinsulzer Aug 22, 2022
57a81ae
Merge branch 'develop' into composite-release-parameters
valentinsulzer Aug 22, 2022
6062891
codacy?
valentinsulzer Aug 22, 2022
0e56517
Ferran comments
valentinsulzer Aug 23, 2022
64484f6
make 'phase' optional
valentinsulzer Aug 23, 2022
85cddeb
fix some tests
valentinsulzer Aug 23, 2022
25af82c
revert example
valentinsulzer Aug 23, 2022
575dcc2
flake8
valentinsulzer Aug 23, 2022
3c7dcae
fix submodel test
valentinsulzer Aug 23, 2022
e71f30d
integration tests
valentinsulzer Aug 23, 2022
0c4b972
fix examples
valentinsulzer Aug 23, 2022
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
10 changes: 8 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

- Added new cumulative variables `Throughput capacity [A.h]` and `Throughput energy [W.h]` to standard variables and summary variables, to assist with degradation studies. Throughput variables are only calculated if `calculate discharge energy` is set to `true`. `Time [s]` and `Time [h]` also added to summary variables. ([#2249](https://github.com/pybamm-team/PyBaMM/pull/2249))
- Added `lipf6_OKane2022` electrolyte to `OKane2022` parameter set ([#2249](https://github.com/pybamm-team/PyBaMM/pull/2249))
- Reformated submodel structure to allow composite electrodes. Composite positive electrode is now also possible. With current implementation, electrodes can have at most two phases. ([#2248](https://github.com/pybamm-team/PyBaMM/pull/2248))

## Bug fixes

Expand All @@ -17,6 +18,10 @@
- Simplified scaling for the exchange-current density. The dimensionless parameter `C_r` is kept, but no longer used anywhere ([#2238](https://github.com/pybamm-team/PyBaMM/pull/2238))
- Added limits for variables in some functions to avoid division by zero, sqrt(negative number), etc ([#2213](https://github.com/pybamm-team/PyBaMM/pull/2213))

## Breaking changes

- Parameters specific to a (primary/secondary) phase in a domain are doubly nested. e.g. `param.c_n_max` is now `param.n.prim.c_max` ([#2248](https://github.com/pybamm-team/PyBaMM/pull/2248))

# [v22.7](https://github.com/pybamm-team/PyBaMM/tree/v22.7) - 2022-07-31

## Features
Expand Down Expand Up @@ -51,7 +56,7 @@
## Breaking changes

- Exchange-current density functions (and some other functions) now take an additional argument, the maximum particle concentration for that phase ([#2134](https://github.com/pybamm-team/PyBaMM/pull/2134))
- Loss of lithium to SEI on cracks is now a degradation variable, so setting a particle mechanics submodel is now compulsory (NoMechanics will suffice)
- Loss of lithium to SEI on cracks is now a degradation variable, so setting a particle mechanics submodel is now compulsory (NoMechanics will suffice) ([#2104](https://github.com/pybamm-team/PyBaMM/pull/2104))

# [v22.6](https://github.com/pybamm-team/PyBaMM/tree/v22.6) - 2022-06-30

Expand All @@ -73,6 +78,7 @@

## Features

- Added a casadi version of the IDKLU solver, which is used for `model.convert_to_format = "casadi"` ([#2002](https://github.com/pybamm-team/PyBaMM/pull/2002))
- Added functionality to generate Julia expressions from a model. See [PyBaMM.jl](https://github.com/tinosulzer/PyBaMM.jl) for how to use these ([#1942](https://github.com/pybamm-team/PyBaMM/pull/1942)))
- Added basic callbacks to the Simulation class, and a LoggingCallback ([#1880](https://github.com/pybamm-team/PyBaMM/pull/1880)))

Expand All @@ -82,7 +88,7 @@

## Breaking changes

- Changed domain-specific parameter names to a nested attribute, e.g. `param.c_n_max` is now `param.n.c_max` ([#2063](https://github.com/pybamm-team/PyBaMM/pull/2063))
- Changed domain-specific parameter names to a nested attribute. `param.n.l_n` is now `param.n.l` ([#2063](https://github.com/pybamm-team/PyBaMM/pull/2063))

# [v22.4](https://github.com/pybamm-team/PyBaMM/tree/v22.4) - 2022-04-30

Expand Down
35 changes: 21 additions & 14 deletions examples/notebooks/models/compare-ecker-data.ipynb

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions examples/notebooks/models/electrode-state-of-health.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@
{
"data": {
"application/vnd.jupyter.widget-view+json": {
"model_id": "97443d8234c241ca8c2fcaad3e21e416",
"model_id": "34d757993a5247958345757ac4f7cbef",
"version_major": 2,
"version_minor": 0
},
"text/plain": [
"interactive(children=(FloatSlider(value=0.0, description='t', max=2.3248422253249537, step=0.02324842225324953…"
"interactive(children=(FloatSlider(value=0.0, description='t', max=2.324842225325321, step=0.023248422253253208…"
]
},
"metadata": {},
Expand All @@ -65,7 +65,7 @@
{
"data": {
"text/plain": [
"<pybamm.plotting.quick_plot.QuickPlot at 0x7fe0614e9bb0>"
"<pybamm.plotting.quick_plot.QuickPlot at 0x7fac51ea9fd0>"
]
},
"execution_count": 2,
Expand Down Expand Up @@ -146,8 +146,8 @@
"Cp = parameter_values.evaluate(param.p.cap_init)\n",
"n_Li = parameter_values.evaluate(param.n_Li_particles_init)\n",
"\n",
"Un = param.n.U_dimensional\n",
"Up = param.p.U_dimensional\n",
"Un = param.n.prim.U_dimensional\n",
"Up = param.p.prim.U_dimensional\n",
"T_ref = param.T_ref"
]
},
Expand Down
Loading