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

Fix conflict main-develop #2514

Merged
merged 16 commits into from
Dec 2, 2022
Merged

Fix conflict main-develop #2514

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5f4913d
Merge pull request #2197 from pybamm-team/develop
brosaplanella Aug 5, 2022
d0f27d3
Merge pull request #2268 from pybamm-team/develop
brosaplanella Aug 30, 2022
8197ebf
Merge pull request #2325 from pybamm-team/develop
brosaplanella Sep 29, 2022
823aab0
Merge pull request #2412 from pybamm-team/develop
brosaplanella Oct 31, 2022
0ae244c
cmd-shift-f pass
aabills Nov 13, 2022
80e0e2c
symbol replacer
aabills Nov 13, 2022
b5bebdc
remove have julia
aabills Nov 13, 2022
960d00a
eliminate julia import
aabills Nov 13, 2022
d532df3
coverage
aabills Nov 13, 2022
0611f20
Update CHANGELOG.md
aabills Nov 13, 2022
641a458
Update CHANGELOG.md
aabills Nov 13, 2022
d9d4521
style: pre-commit fixes
pre-commit-ci[bot] Nov 13, 2022
f4b9cf1
Update version.py
aabills Nov 13, 2022
c544b6d
Merge pull request #2454 from abillscmu/main
valentinsulzer Nov 14, 2022
dcdfe19
Merge branch 'main' into fix-conflict-main-develop
brosaplanella Dec 2, 2022
cbef368
fixed version.py
brosaplanella Dec 2, 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
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
## Features

- Equivalent circuit models ([#2478](https://github.com/pybamm-team/PyBaMM/pull/2478))
- New Idaklu solver options for jacobian type and linear solver, support Sundials v6 ([#2444](https://github.com/pybamm-team/PyBaMM/pull/2444))
- Added `scale` and `reference` attributes to `Variable` objects, which can be use to make the ODE/DAE solver better conditioned ([#2440](https://github.com/pybamm-team/PyBaMM/pull/2440))
- SEI reactions can now be asymmetric ([#2425](https://github.com/pybamm-team/PyBaMM/pull/2425))
- New Idaklu solver options for jacobian type and linear solver, support Sundials v6 ([#2444](https://github.com/pybamm-team/PyBaMM/pull/2444))

## Bug fixes

Expand All @@ -16,8 +16,8 @@

## Optimizations

- Implemented memoization via `cache` and `cached_property` from functools ([#2465](https://github.com/pybamm-team/PyBaMM/pull/2465))
- `ParameterValues` now avoids trying to process children if a function parameter is an object that doesn't depend on its children ([#2477](https://github.com/pybamm-team/PyBaMM/pull/2477))
- Implemented memoization via `cache` and `cached_property` from functools ([#2465](https://github.com/pybamm-team/PyBaMM/pull/2465))
- Added more rules for simplifying expressions, especially around Concatenations. Also, meshes constructed from multiple domains are now cached ([#2443](https://github.com/pybamm-team/PyBaMM/pull/2443))
- Added more rules for simplifying expressions. Constants in binary operators are now moved to the left by default (e.g. `x*2` returns `2*x`) ([#2424](https://github.com/pybamm-team/PyBaMM/pull/2424))

Expand Down