Skip to content

Commit c6a48e8

Browse files
committed
Merge branch 'develop' of https://github.com/pybamm-team/PyBaMM into v24.5
2 parents f66db40 + 7ba74dc commit c6a48e8

File tree

284 files changed

+6052
-103256
lines changed

Some content is hidden

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

284 files changed

+6052
-103256
lines changed

.all-contributorsrc

Lines changed: 86 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
22
"files": [
3-
"all_contributors.md"
3+
"all_contributors.md",
4+
"README.md"
45
],
56
"imageSize": 100,
67
"commit": false,
78
"badgeTemplate": "[![All Contributors](https://img.shields.io/badge/all_contributors-<%= contributors.length %>-orange.svg)](#-contributors)",
89
"contributors": [
910
{
10-
"login": "tinosulzer",
11+
"login": "valentinsulzer",
1112
"name": "Valentin Sulzer",
1213
"avatar_url": "https://avatars3.githubusercontent.com/u/20817509?v=4",
1314
"profile": "https://sites.google.com/view/valentinsulzer",
@@ -856,6 +857,89 @@
856857
"contributions": [
857858
"doc"
858859
]
860+
},
861+
{
862+
"login": "Hongmeiqi",
863+
"name": "Hongmeiqi",
864+
"avatar_url": "https://avatars.githubusercontent.com/u/143798726?v=4",
865+
"profile": "https://github.com/Hongmeiqi",
866+
"contributions": [
867+
"doc"
868+
]
869+
},
870+
{
871+
"login": "mleot",
872+
"name": "mleot",
873+
"avatar_url": "https://avatars.githubusercontent.com/u/140573653?v=4",
874+
"profile": "https://github.com/mleot",
875+
"contributions": [
876+
"code",
877+
"test"
878+
]
879+
},
880+
{
881+
"login": "abhicodes369",
882+
"name": "Abhi ram",
883+
"avatar_url": "https://avatars.githubusercontent.com/u/119055274?v=4",
884+
"profile": "https://github.com/abhicodes369",
885+
"contributions": [
886+
"test"
887+
]
888+
},
889+
{
890+
"login": "parkec3",
891+
"name": "Caitlin D. Parke",
892+
"avatar_url": "https://avatars.githubusercontent.com/u/26883801?v=4",
893+
"profile": "https://github.com/parkec3",
894+
"contributions": [
895+
"code"
896+
]
897+
},
898+
{
899+
"login": "Afgr1087",
900+
"name": "Andres Felipe Galvis Rodriguez",
901+
"avatar_url": "https://avatars.githubusercontent.com/u/56610829?v=4",
902+
"profile": "https://github.com/Afgr1087",
903+
"contributions": [
904+
"code"
905+
]
906+
},
907+
{
908+
"login": "ikorotkin",
909+
"name": "Ivan Korotkin",
910+
"avatar_url": "https://avatars.githubusercontent.com/u/29599800?v=4",
911+
"profile": "https://github.com/ikorotkin",
912+
"contributions": [
913+
"code"
914+
]
915+
},
916+
{
917+
"login": "santacodes",
918+
"name": "Santhosh",
919+
"avatar_url": "https://avatars.githubusercontent.com/u/52504160?v=4",
920+
"profile": "https://github.com/santacodes",
921+
"contributions": [
922+
"code",
923+
"infra"
924+
]
925+
},
926+
{
927+
"login": "smitasahu2",
928+
"name": "Smita Sahu",
929+
"avatar_url": "https://avatars.githubusercontent.com/u/57876346?v=4",
930+
"profile": "https://github.com/smitasahu2",
931+
"contributions": [
932+
"code"
933+
]
934+
},
935+
{
936+
"login": "Ubham16",
937+
"name": "Ubham16",
938+
"avatar_url": "https://avatars.githubusercontent.com/u/173074476?v=4",
939+
"profile": "https://github.com/Ubham16",
940+
"contributions": [
941+
"code"
942+
]
859943
}
860944
],
861945
"contributorsPerLine": 7,

.github/CODEOWNERS

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# Automatically request reviews from maintainers
22

33
# Package
4-
/pybamm/discretisations/ @martinjrobins @rtimms @tinosulzer
5-
/pybamm/experiment/ @brosaplanella @martinjrobins @rtimms @tinosulzer @TomTranter
6-
/pybamm/expression_tree/ @martinjrobins @rtimms @tinosulzer
7-
/pybamm/geometry/ @martinjrobins @rtimms @tinosulzer
8-
/pybamm/input/ @brosaplanella @DrSOKane @rtimms @tinosulzer @TomTranter @kratman
9-
/pybamm/meshes/ @martinjrobins @rtimms @tinosulzer @rtimms
10-
/pybamm/models/ @brosaplanella @DrSOKane @rtimms @tinosulzer @TomTranter @rtimms
11-
/pybamm/parameters/ @brosaplanella @DrSOKane @rtimms @tinosulzer @TomTranter @rtimms @kratman
12-
/pybamm/plotting/ @martinjrobins @rtimms @Saransh-cpp @tinosulzer @rtimms @kratman @agriyakhetarpal
13-
/pybamm/solvers/ @martinjrobins @rtimms @tinosulzer @TomTranter @rtimms
14-
/pybamm/spatial_methods/ @martinjrobins @rtimms @tinosulzer @rtimms
4+
/pybamm/discretisations/ @martinjrobins @rtimms @valentinsulzer
5+
/pybamm/experiment/ @brosaplanella @martinjrobins @rtimms @valentinsulzer @TomTranter
6+
/pybamm/expression_tree/ @martinjrobins @rtimms @valentinsulzer
7+
/pybamm/geometry/ @martinjrobins @rtimms @valentinsulzer
8+
/pybamm/input/ @brosaplanella @DrSOKane @rtimms @valentinsulzer @TomTranter @kratman
9+
/pybamm/meshes/ @martinjrobins @rtimms @valentinsulzer @rtimms
10+
/pybamm/models/ @brosaplanella @DrSOKane @rtimms @valentinsulzer @TomTranter @rtimms
11+
/pybamm/parameters/ @brosaplanella @DrSOKane @rtimms @valentinsulzer @TomTranter @rtimms @kratman
12+
/pybamm/plotting/ @martinjrobins @rtimms @Saransh-cpp @valentinsulzer @rtimms @kratman @agriyakhetarpal
13+
/pybamm/solvers/ @martinjrobins @rtimms @valentinsulzer @TomTranter @rtimms
14+
/pybamm/spatial_methods/ @martinjrobins @rtimms @valentinsulzer @rtimms
1515
/pybamm/* @pybamm-team/maintainers # the files directly under /pybamm/, will not recurse
1616

1717
# CI/CD workflows

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ body:
3434
id: reproduce
3535
attributes:
3636
label: Steps to Reproduce
37-
description: Tell us how to reproduce this behaviour. Ideally, this should take the form of a [Minimum Workable Example](https://stackoverflow.com/help/minimal-reproducible-example)
37+
description: Tell us how to reproduce this behaviour. Ideally, this should include a code block which produces the error. Strive to make this example as small and simple as possible. It should contain the code required to reproduce the error, and no additional code. For example, if your code includes lines to run a simulation, then lines to plot the results, and the lines to run the simulation fail, only include those lines (and not the plotting lines, which are irrelevant). Often, the act of simplifying code to pinpoint errors can help you find bugs in your own code. For more information, see [these references](https://en.wikipedia.org/wiki/Minimal_reproducible_example#External_links)
3838
validations:
3939
required: true
4040
- type: textarea

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
blank_issues_enabled: true
22
contact_links:
33
- name: I'm unsure where to go
4-
url: https://www.pybamm.org/contact
4+
url: https://www.pybamm.org/community
55
about: If you are unsure where to go, then joining our chat is recommended; Just ask!

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
password: ${{ secrets.DOCKERHUB_TOKEN }}
3131

3232
- name: Build and push Docker image to Docker Hub
33-
uses: docker/build-push-action@v5
33+
uses: docker/build-push-action@v6
3434
with:
3535
context: .
3636
file: scripts/Dockerfile

0 commit comments

Comments
 (0)