Skip to content

Commit 664a024

Browse files
Merge branch 'develop' into i2643-banded
2 parents 5faa557 + c9e2a45 commit 664a024

File tree

119 files changed

+1026
-783
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+1026
-783
lines changed

.all-contributorsrc

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,18 @@
550550
"avatar_url": "https://avatars.githubusercontent.com/u/112731474?v=4",
551551
"profile": "https://github.com/iatzak",
552552
"contributions": [
553-
"doc"
553+
"doc",
554+
"bug",
555+
"code"
556+
]
557+
},
558+
{
559+
"login": "ayeankit",
560+
"name": "Ankit Kumar",
561+
"avatar_url": "https://avatars.githubusercontent.com/u/72691866?v=4",
562+
"profile": "https://github.com/ayeankit",
563+
"contributions": [
564+
"code"
554565
]
555566
}
556567
],

.github/workflows/url_checker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Checkout
1414
uses: actions/checkout@v3
1515
- name: URLs-checker
16-
uses: urlstechie/urlchecker-action@0.0.31
16+
uses: urlstechie/urlchecker-action@master
1717
with:
1818
# A comma-separated list of file types to cover in the URL checks
1919
file_types: .rst,.md,.py,.ipynb

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*.DS_Store
77
*.mat
88
*.csv
9+
*.hidden
910

1011
# don't ignore important .txt and .csv files
1112
!requirements*

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ repos:
1010
exclude: assets/js/webapp\.js
1111

1212
- repo: https://github.com/psf/black
13-
rev: 22.12.0
13+
rev: 23.1.0
1414
hooks:
1515
- id: black
1616

1717
- repo: https://github.com/charliermarsh/ruff-pre-commit
18-
rev: "v0.0.237"
18+
rev: "v0.0.246"
1919
hooks:
2020
- id: ruff
2121
args: [--ignore=E741, --exclude=__init__.py]

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# [Unreleased](https://github.com/pybamm-team/PyBaMM/)
22

3+
## Features
4+
5+
- Added temperature control to experiment class. ([#2518])(https://github.com/pybamm-team/PyBaMM/pull/2518)
6+
- The "particle size" option can now be a tuple to allow different behaviour in each electrode([#2672](https://github.com/pybamm-team/PyBaMM/pull/2672)).
7+
8+
## Bug fixes
9+
10+
- Fixed the length scaling for the first dimension of r-R plots ([#2663](https://github.com/pybamm-team/PyBaMM/pull/2663)).
11+
312
# [v23.1](https://github.com/pybamm-team/PyBaMM/tree/v23.1) - 2023-01-31
413

514
## Features

README.md

Lines changed: 53 additions & 50 deletions
Large diffs are not rendered by default.

benchmarks/different_model_options.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ class TimeBuildModelLossActiveMaterial:
8383
)
8484

8585
def time_setup_model(self, model, params):
86-
8786
build_model("Ai2020", model, "loss of active material", params)
8887

8988

benchmarks/work_precision_sets/time_vs_abstols.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@
3535
itertools.product(solvers.values(), models.values()),
3636
itertools.product(solvers, models),
3737
):
38-
3938
for params in parameters:
40-
4139
time_points = []
4240
solver = i[0]
4341

@@ -70,13 +68,11 @@
7068
disc.process_model(model)
7169

7270
for tol in abstols:
73-
7471
solver.atol = tol
7572
solver.solve(model, t_eval=t_eval)
7673
time = 0
7774
runs = 20
7875
for k in range(0, runs):
79-
8076
solution = solver.solve(model, t_eval=t_eval)
8177
time += solution.solve_time.value
8278
time = time / runs

benchmarks/work_precision_sets/time_vs_dt_max.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@
3939
models.values(),
4040
models,
4141
):
42-
4342
for params in parameters:
44-
4543
time_points = []
4644
# solver = pybamm.CasadiSolver()
4745

@@ -74,14 +72,12 @@
7472
disc.process_model(model)
7573

7674
for t in dt_max:
77-
7875
solver = pybamm.CasadiSolver(dt_max=t)
7976

8077
solver.solve(model, t_eval=t_eval)
8178
time = 0
8279
runs = 20
8380
for k in range(0, runs):
84-
8581
solution = solver.solve(model, t_eval=t_eval)
8682
time += solution.solve_time.value
8783
time = time / runs

benchmarks/work_precision_sets/time_vs_mesh_size.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
itertools.product(solvers.values(), models.values()),
3030
itertools.product(solvers, models),
3131
):
32-
3332
for params in parameters:
3433
time_points = []
3534
solver = i[0]
@@ -42,7 +41,6 @@
4241
i = list(i)
4342

4443
for N in npts:
45-
4644
var_pts = {
4745
"x_n": N, # negative electrode
4846
"x_s": N, # separator
@@ -57,7 +55,6 @@
5755
time = 0
5856
runs = 20
5957
for k in range(0, runs):
60-
6158
solution = sim.solve([0, 3500])
6259
time += solution.solve_time.value
6360
time = time / runs

0 commit comments

Comments
 (0)