Skip to content

Commit

Permalink
Merge branch 'develop' into patch-optional-deps
Browse files Browse the repository at this point in the history
  • Loading branch information
arjxn-py authored Apr 9, 2024
2 parents 80b1c56 + c204bdd commit 37e2024
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/run_periodic_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:

- name: Upload coverage report
if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.11
uses: codecov/codecov-action@v4.1.1
uses: codecov/codecov-action@v4.2.0
with:
token: ${{ secrets.CODECOV_TOKEN }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_on_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ jobs:
run: python -m nox -s coverage

- name: Upload coverage report
uses: codecov/codecov-action@v4.1.1
uses: codecov/codecov-action@v4.2.0
with:
token: ${{ secrets.CODECOV_TOKEN }}

Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ repos:
additional_dependencies: [black==23.*]

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v4.6.0
hooks:
- id: check-added-large-files
- id: check-case-conflict
Expand Down
13 changes: 6 additions & 7 deletions pybamm/solvers/base_solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -710,16 +710,16 @@ def solve(
The model whose solution to calculate. Must have attributes rhs and
initial_conditions. All calls to solve must pass in the same model or
an error is raised
t_eval : numeric type
The times (in seconds) at which to compute the solution
t_eval : None, list or ndarray, optional
The times (in seconds) at which to compute the solution. Defaults to None.
inputs : dict or list, optional
A dictionary or list of dictionaries describing any input parameters to
pass to the model when solving
nproc : int, optional
Number of processes to use when solving for more than one set of input
parameters. Defaults to value returned by "os.cpu_count()".
calculate_sensitivities : list of str or bool
If true, solver calculates sensitivities of all input parameters.
calculate_sensitivities : list of str or bool, optional
Whether the solver calculates sensitivities of all input parameters. Defaults to False.
If only a subset of sensitivities are required, can also pass a
list of input parameter names
Expand Down Expand Up @@ -1117,9 +1117,8 @@ def step(
npts : deprecated
inputs : dict, optional
Any input parameters to pass to the model when solving
save : bool
Turn on to store the solution of all previous timesteps
save : bool, optional
Save solution with all previous timesteps. Defaults to True.
Raises
------
:class:`pybamm.ModelError`
Expand Down

0 comments on commit 37e2024

Please sign in to comment.