Skip to content

Commit 90ee509

Browse files
committed
Merge branch 'develop' of github.com:kratman/PyBaMM into feat/removeIDAKLU
2 parents 4a31ff8 + f05cae2 commit 90ee509

39 files changed

+1211
-227
lines changed

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,6 @@ jobs:
6868
# Upload the results to GitHub's code scanning dashboard (optional).
6969
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
7070
- name: "Upload to code-scanning"
71-
uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
71+
uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
7272
with:
7373
sarif_file: results.sarif

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ci:
44

55
repos:
66
- repo: https://github.com/astral-sh/ruff-pre-commit
7-
rev: "v0.6.9"
7+
rev: "v0.7.2"
88
hooks:
99
- id: ruff
1010
args: [--fix, --show-fixes]
@@ -13,7 +13,7 @@ repos:
1313
types_or: [python, pyi, jupyter]
1414

1515
- repo: https://github.com/adamchainz/blacken-docs
16-
rev: "1.19.0"
16+
rev: "1.19.1"
1717
hooks:
1818
- id: blacken-docs
1919
additional_dependencies: [black==23.*]

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## Features
44

5+
- Adds support to `pybamm.Experiment` for the `output_variables` option in the `IDAKLUSolver`. ([#4534](https://github.com/pybamm-team/PyBaMM/pull/4534))
56
- Adds an option "voltage as a state" that can be "false" (default) or "true". If "true" adds an explicit algebraic equation for the voltage. ([#4507](https://github.com/pybamm-team/PyBaMM/pull/4507))
67
- Improved `QuickPlot` accuracy for simulations with Hermite interpolation. ([#4483](https://github.com/pybamm-team/PyBaMM/pull/4483))
78
- Added Hermite interpolation to the (`IDAKLUSolver`) that improves the accuracy and performance of post-processing variables. ([#4464](https://github.com/pybamm-team/PyBaMM/pull/4464))
@@ -20,7 +21,7 @@
2021
- Removed the `start_step_offset` setting and disabled minimum `dt` warnings for drive cycles with the (`IDAKLUSolver`). ([#4416](https://github.com/pybamm-team/PyBaMM/pull/4416))
2122

2223
## Bug Fixes
23-
24+
- Fixed bug in post-processing solutions with infeasible experiments using the (`IDAKLUSolver`). ([#4541](https://github.com/pybamm-team/PyBaMM/pull/4541))
2425
- Disabled IREE on MacOS due to compatibility issues and added the CasADI
2526
path to the environment to resolve issues on MacOS and Linux. Windows
2627
users may still experience issues with interpolation. ([#4528](https://github.com/pybamm-team/PyBaMM/pull/4528))

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ You now have everything you need to start making changes!
4444

4545
### B. Writing your code
4646

47-
6. PyBaMM is developed in [Python](https://www.python.org)), and makes heavy use of [NumPy](https://numpy.org/) (see also [NumPy for MatLab users](https://numpy.org/doc/stable/user/numpy-for-matlab-users.html) and [Python for R users](https://www.rebeccabarter.com/blog/2023-09-11-from_r_to_python)).
47+
6. PyBaMM is developed in [Python](https://www.python.org), and makes heavy use of [NumPy](https://numpy.org/).
4848
7. Make sure to follow our [coding style guidelines](#coding-style-guidelines).
4949
8. Commit your changes to your branch with [useful, descriptive commit messages](https://chris.beams.io/posts/git-commit/): Remember these are
5050
publicly visible and should still make sense a few months ahead in time.
@@ -116,8 +116,8 @@ PyBaMM provides a utility function `import_optional_dependency`, to check for th
116116

117117
Optional dependencies should never be imported at the module level, but always inside methods. For example:
118118

119-
```
120-
def use_pybtex(x,y,z):
119+
```python
120+
def use_pybtex(x, y, z):
121121
pybtex = import_optional_dependency("pybtex")
122122
...
123123
```

docs/source/api/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ API documentation
99
:Release: |version|
1010
:Date: |today|
1111

12-
This reference manual details functions, modules, and objects
13-
included in PyBaMM, describing what they are and what they do.
12+
This reference manual details the classes, functions, modules, and objects included in PyBaMM, describing what they are and what they do.
1413
For a high-level introduction to PyBaMM, see the :ref:`user guide <user_guide>` and the :ref:`examples <pybamm_examples>`.
1514

15+
1616
.. toctree::
1717
:maxdepth: 2
1818

docs/source/api/util.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,5 @@ Utility functions
1919
.. autofunction:: pybamm.has_jax
2020

2121
.. autofunction:: pybamm.is_jax_compatible
22+
23+
.. autofunction:: pybamm.set_logging_level

docs/source/examples/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ The notebooks are organised into subfolders, and can be viewed in the galleries
8787
notebooks/parameterization/change-input-current.ipynb
8888
notebooks/parameterization/parameter-values.ipynb
8989
notebooks/parameterization/parameterization.ipynb
90+
notebooks/parameterization/sensitivities_and_data_fitting.ipynb
9091

9192
.. nbgallery::
9293
:caption: Simulations and Experiments

docs/source/examples/notebooks/getting_started/tutorial-4-setting-parameter-values.ipynb

Lines changed: 121 additions & 89 deletions
Large diffs are not rendered by default.

docs/source/examples/notebooks/parameterization/parameter-values.ipynb

Lines changed: 75 additions & 32 deletions
Large diffs are not rendered by default.

docs/source/examples/notebooks/parameterization/sensitivities_and_data_fitting.ipynb

Lines changed: 327 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)