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.

Sign up for GitHub

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

Jump to bottom

Feature/esoh model update #2192

Merged
merged 42 commits into from
Jul 27, 2022
Merged

Feature/esoh model update #2192

merged 42 commits into from
Jul 27, 2022

Conversation

valentinsulzer
Copy link
Member

Description

Takes over from #2109

Fixes # (issue)

Type of change

Please add a line in the relevant section of CHANGELOG.md to document the change (include PR #) - note reverse order of PR #s. If necessary, also add to the list of breaking changes.

  • New feature (non-breaking change which adds functionality)
  • Optimization (back-end change that speeds up the code)
  • Bug fix (non-breaking change which fixes an issue)

Key checklist:

  • No style issues: $ flake8
  • All tests pass: $ python run-tests.py --unit
  • The documentation builds: $ cd docs and then $ make clean; make html

You can run all three at once, using $ python run-tests.py --quick.

Further checks:

  • Code is commented, particularly in hard-to-understand areas
  • Tests added that prove fix is effective or that feature works

anoushka2000 and others added 30 commits June 16, 2022 10:47
@anoushka2000
ElectrodeSOH with two stage solving
4de6073
@anoushka2000
update notebook for eSOH model
8603def
@anoushka2000
Merge remote-tracking branch 'origin/develop' into feature/esoh_model…
44fc92c 
…_update

# Conflicts:
#	examples/notebooks/models/electrode-state-of-health.ipynb
@anoushka2000
update notebook
9025dac
@anoushka2000
Merge remote-tracking branch 'origin/develop' into feature/esoh_model…
d353660 
…_update
@anoushka2000
solve eSOH as ElectrodeSOHx100 and ElectrodeSOHC models
fce929f
@anoushka2000
update electrode soh test
60ff1d0
@anoushka2000
Cn, Cp and n_Li from inputs
b302bfc
@anoushka2000
formatting
97ee9d1
@anoushka2000
update simulation to set up both esoh models if calc_esoh
2c582bf
@anoushka2000
Merge branch 'pybamm-team:develop' into feature/esoh_model_update
45947d4
@anoushka2000
modify get_cycle_summary_variables for two eSOH models
8948968
@anoushka2000
Merge remote-tracking branch 'origin/feature/esoh_model_update' into …
d59390d 
…feature/esoh_model_update
@anoushka2000
Merge remote-tracking branch 'origin/develop' into feature/esoh_model…
7f1a238 
…_update
@anoushka2000
update simulation, notebook and tests
321a740
@anoushka2000
black and flake8
fe8ba6f
@valentinsulzer
working on feasibility checks
adfc952
@valentinsulzer
use check_feasible when solving for electrode soh
86fa7a6
@valentinsulzer
reformatting
4e82273
@anoushka2000
line length
3066711
@anoushka2000
Merge branch 'develop' into feature/esoh_model_update
6697b37
@anoushka2000
fix upstream merge
d74b661
@anoushka2000
get value from Scalar x_100_upper_limit
cf532ca
@anoushka2000
allow data for both electrodes OCP and fix get_initial_stoichiometries
88447e0
@anoushka2000
fix get_initial_stoichiometries (parameter_values as kwarg)
c687aec
@anoushka2000
correct case where only OCPn_data
af3578e
@anoushka2000
correct model order in get_initial_stoichiometries
74704a6
@anoushka2000
flake8
4e93bcb
@anoushka2000
case for both OCPn_data and OCPp_data
7163ed9
@valentinsulzer
merge anoushka changes
7fa5553
@codecov
Copy link

codecov bot commented Jul 26, 2022 •
edited
Loading

Codecov Report

Merging #2192 (a5f8687) into develop (9856785) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@           Coverage Diff            @@
##           develop    #2192   +/-   ##
========================================
  Coverage    99.35%   99.35%           
========================================
  Files          347      347           
  Lines        19241    19310   +69     
========================================
+ Hits         19117    19186   +69     
  Misses         124      124
Impacted Files Coverage Δ
pybamm/solvers/algebraic_solver.py 100.00% <ø> (ø)
...models/full_battery_models/lithium_ion/__init__.py 100.00% <100.00%> (ø)
...s/full_battery_models/lithium_ion/electrode_soh.py 100.00% <100.00%> (ø)
pybamm/simulation.py 98.81% <100.00%> (-0.01%) ⬇️
pybamm/solvers/solution.py 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9856785...a5f8687. Read the comment docs.

brosaplanella
brosaplanella approved these changes Jul 27, 2022
View reviewed changes
Copy link
Member

@brosaplanella brosaplanella left a comment

Choose a reason for hiding this comment

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

Looks good! You will have to update CHANGELOG before merging.

pybamm/models/full_battery_models/lithium_ion/electrode_soh.py
return pybamm.AlgebraicSolver()


class ElectrodeSOHx0(pybamm.BaseModel):
Copy link
Member

Choose a reason for hiding this comment

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

Needs docstring (probably it can be very similar to the old one that has been deleted)

@valentinsulzer valentinsulzer merged commit 468b39f into develop Jul 27, 2022
@valentinsulzer valentinsulzer mentioned this pull request Jul 29, 2022
Merged
8 tasks
@valentinsulzer valentinsulzer deleted the feature/esoh_model_update branch September 15, 2022 19:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brosaplanella brosaplanella brosaplanella approved these changes

@rtimms rtimms Awaiting requested review from rtimms

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@valentinsulzer @brosaplanella @anoushka2000