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

Version 0.2.1 develop -> master #931

Merged
merged 258 commits into from
Mar 31, 2020
Merged

Version 0.2.1 develop -> master #931

merged 258 commits into from
Mar 31, 2020

Conversation

valentinsulzer
Copy link
Member

Merge develop into master for release

valentinsulzer and others added 30 commits February 24, 2020 10:23
@valentinsulzer
#846 fix accidentally broken convection model
98bab54
@valentinsulzer
#846 fix dfn example
c03af62
@valentinsulzer
Merge branch 'master' into issue-846-bugs
ee0028c
@valentinsulzer
Merge branch 'master' into issue-846-bugs
c5542a9
@valentinsulzer
#846 windows test and skipping non-time discontinuities
da91cd9
@valentinsulzer
Merge branch 'issue-846-bugs' of github.com:pybamm-team/PyBaMM into i…
31060c0 
…ssue-846-bugs
@valentinsulzer
#846 generalized x_average
10ddc82
@valentinsulzer
#846 merge master
30aa25c
@TomTranter
Add new electrolyte functions from Landesfeind 2019
fa7680a
@TomTranter
style
05a2956
@valentinsulzer
#861 remove external submodels
9225e00
@valentinsulzer
Merge branch 'master' into issue-846-bugs
864999f
@valentinsulzer
#861 changelog [ci skip]
7052672
@valentinsulzer
#863 remove double-count
a1f4018
@valentinsulzer
Merge pull request #862 from pybamm-team/issue-861-remove-set-external
d704c9e 
#861 remove external submodels
@TomTranter
Correct unit, test and style
7e5a0e5
@TomTranter
sort files to pass old python tests
23cbc5f
@valentinsulzer
Merge branch 'develop' into issue-863-double-count
64205b6
@valentinsulzer
#863 changelog
412fe37
@valentinsulzer
Merge branch 'develop' into issue-846-bugs
5c94b24
@valentinsulzer
#865 reformat interface submodels
da0aa8b
@valentinsulzer
Merge branch 'develop' into issue-865-interface
9229a95
@valentinsulzer
#865 fix unit tests
f0a91aa
@valentinsulzer
#865 fix docs
618bacd
@valentinsulzer
#865 fix examples
1a5c5d3
@valentinsulzer
#865 fix j0 for lead-acid
ea6c679
@valentinsulzer
#865 coverage
7cea7b5
@valentinsulzer
#830 reformat algebraic solver
bedfc2e
@valentinsulzer
#830 remove time-too-short test
720a9a4
@valentinsulzer
#830 add casadi algebraic solver
2c78087
Scottmar93 and others added 24 commits March 30, 2020 11:54
@Scottmar93
#880 fixed tests
7e66610
@valentinsulzer
Merge pull request #926 from ferranbrosa/issue-892-install-windows
95b0473 
Issue 892 install windows
@rtimms
Merge branch 'develop' into issue-729-ecker-params
144d16c
@Scottmar93
Merge pull request #881 from pybamm-team/get-function-args
891424b 
Get function args
@rtimms
#729 add dlnf param
8f3d905
@rtimms
#729 merge develop
8803100
@rtimms
#729 remove NULL functions
33cf784
@rtimms
#729 update electrolyte params
5d001bd
@rtimms
#729 fix cli example
887d08c
@rtimms
#729 fix cli example
b10b20c
@valentinsulzer
changes for new release
3098936
@valentinsulzer
#902 make time dimensional
6ebb2d4
@valentinsulzer
#902 fix leading-order models
10b8ec1
@valentinsulzer
#729 trying to fix cli
423e97e
@valentinsulzer
#729 trying to fix cli
26f616f
@valentinsulzer
Merge pull request #922 from pybamm-team/issue-729-ecker-params
4dba9da 
Issue 729 ecker params
@rtimms
Merge pull request #929 from pybamm-team/issue-902-voltage-power-time
edef972 
#902 make time dimensional
@valentinsulzer
fixing quickplot for jupyter notebook
ad60cc1
@valentinsulzer
Merge branch 'develop' into new-version
f53a820
@valentinsulzer
changelog
34b76fb
@valentinsulzer
add dynamic_plot method
ac395fe
@valentinsulzer
fix bug
353a81e
@valentinsulzer
fix error message in solution
d465c33
@valentinsulzer
Merge pull request #930 from pybamm-team/new-version
4cc26b1 
Version 0.2.1 release
@codecov
Copy link

codecov bot commented Mar 31, 2020 •
edited
Loading

Codecov Report

Merging #931 into master will not change coverage by %.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #931   +/-   ##
=======================================
  Coverage   98.04%   98.04%           
=======================================
  Files         216      216           
  Lines       11117    11117           
=======================================
  Hits        10900    10900           
  Misses        217      217

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 4cc26b1...4cc26b1. Read the comment docs.

brosaplanella
brosaplanella approved these changes Mar 31, 2020
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, just one minor thing: issue #858 appears twice in CHANGELOG.md.

@valentinsulzer
Copy link
Member Author

ah crap, ok well spotted, I'll just fix this for the next release so we can get this one out in time for the workshop

@valentinsulzer valentinsulzer merged commit 105714c into master Mar 31, 2020
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

@Scottmar93 Scottmar93 Awaiting requested review from Scottmar93

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

Successfully merging this pull request may close these issues.
7 participants
@valentinsulzer @brosaplanella @TomTranter @martinjrobins @viviantran27 @rtimms @Scottmar93