Skip to content

Commit 26acd96

Browse files
medha-14medha-14
authored
Merge branch 'develop' into latexify_eqcm
2 parents 2d8e015 + ac32564 commit 26acd96

22 files changed

+76
-63
lines changed

‎.github/workflows/lychee_url_checker.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
# use stable version for now to avoid breaking changes
3838
- name: Lychee URL checker
39-
uses: lycheeverse/lychee-action@1d97d84f0bc547f7b25f4c2170d87d810dc2fb2c # v2.4.0
39+
uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2.4.1
4040
with:
4141
# arguments with file types to check
4242
args: >-

‎.github/workflows/scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,6 @@ jobs:
6565
# Upload the results to GitHub's code scanning dashboard (optional).
6666
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
6767
- name: "Upload to code-scanning"
68-
uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
68+
uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
6969
with:
7070
sarif_file: results.sarif

‎.pre-commit-config.yaml‎

Lines changed: 3 additions & 3 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.11.7"
7+
rev: "v0.11.9"
88
hooks:
99
- id: ruff
1010
args: [--fix, --show-fixes]
@@ -39,12 +39,12 @@ repos:
3939
- id: rst-inline-touching-normal
4040

4141
- repo: https://github.com/scientific-python/cookie
42-
rev: 2025.01.22
42+
rev: 2025.05.02
4343
hooks:
4444
- id: sp-repo-review
4545

4646
- repo: https://github.com/woodruffw/zizmor-pre-commit
47-
rev: v1.6.0
47+
rev: v1.7.0
4848
hooks:
4949
- id: zizmor
5050
args: [--pedantic]

‎benchmarks/different_model_options.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ def build_model(parameter, model_, option, value):
3434
class SolveModel:
3535
solver: pybamm.BaseSolver
3636
model: pybamm.BaseModel
37-
t_eval: npt.NDArray
38-
t_interp: npt.NDArray | None
37+
t_eval: npt.NDArray[np.float64]
38+
t_interp: npt.NDArray[np.float64] | None
3939

4040
def solve_setup(self, parameter, model_, option, value, solver_class):
4141
self.solver = solver_class()

‎benchmarks/time_solve_models.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ class TimeSolveSPM:
3131
)
3232
model: pybamm.BaseModel
3333
solver: pybamm.BaseSolver
34-
t_eval: npt.NDArray
35-
t_interp: npt.NDArray | None
34+
t_eval: npt.NDArray[np.float64]
35+
t_interp: npt.NDArray[np.float64] | None
3636

3737
def setup(self, solve_first, parameters, solver_class):
3838
set_random_seed()
@@ -97,7 +97,7 @@ class TimeSolveSPMe:
9797
)
9898
model: pybamm.BaseModel
9999
solver: pybamm.BaseSolver
100-
t_eval: npt.NDArray
100+
t_eval: npt.NDArray[np.float64]
101101

102102
def setup(self, solve_first, parameters, solver_class):
103103
set_random_seed()
@@ -161,7 +161,7 @@ class TimeSolveDFN:
161161
)
162162
model: pybamm.BaseModel
163163
solver: pybamm.BaseSolver
164-
t_eval: npt.NDArray
164+
t_eval: npt.NDArray[np.float64]
165165

166166
def setup(self, solve_first, parameters, solver_class):
167167
set_random_seed()

‎src/pybamm/expression_tree/binary_operators.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ def _binary_new_copy(self, left: ChildSymbol, right: ChildSymbol):
153153
def evaluate(
154154
self,
155155
t: float | None = None,
156-
y: npt.NDArray | None = None,
157-
y_dot: npt.NDArray | None = None,
156+
y: npt.NDArray[np.float64] | None = None,
157+
y_dot: npt.NDArray[np.float64] | None = None,
158158
inputs: dict | str | None = None,
159159
):
160160
"""See :meth:`pybamm.Symbol.evaluate()`."""

‎src/pybamm/expression_tree/concatenations.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import sympy
1313
from scipy.sparse import issparse, vstack
1414
from collections.abc import Sequence
15+
from typing import Any
1516

1617
import pybamm
1718

@@ -114,7 +115,7 @@ def get_children_domains(self, children: Sequence[pybamm.Symbol]):
114115

115116
return domains
116117

117-
def _concatenation_evaluate(self, children_eval: list[npt.NDArray]):
118+
def _concatenation_evaluate(self, children_eval: list[npt.NDArray[Any]]):
118119
"""See :meth:`Concatenation._concatenation_evaluate()`."""
119120
if len(children_eval) == 0:
120121
return np.array([])
@@ -124,8 +125,8 @@ def _concatenation_evaluate(self, children_eval: list[npt.NDArray]):
124125
def evaluate(
125126
self,
126127
t: float | None = None,
127-
y: npt.NDArray | None = None,
128-
y_dot: npt.NDArray | None = None,
128+
y: npt.NDArray[np.float64] | None = None,
129+
y_dot: npt.NDArray[np.float64] | None = None,
129130
inputs: dict | str | None = None,
130131
):
131132
"""See :meth:`pybamm.Symbol.evaluate()`."""
@@ -369,7 +370,7 @@ def create_slices(self, node: pybamm.Symbol) -> defaultdict:
369370
start = end
370371
return slices
371372

372-
def _concatenation_evaluate(self, children_eval: list[npt.NDArray]):
373+
def _concatenation_evaluate(self, children_eval: list[npt.NDArray[Any]]):
373374
"""See :meth:`Concatenation._concatenation_evaluate()`."""
374375
# preallocate vector
375376
vector = np.empty((self._size, 1))

‎src/pybamm/expression_tree/discrete_time_sum.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import pybamm
22
import numpy.typing as npt
3+
import numpy as np
4+
from typing import Any
35

46

57
class DiscreteTimeData(pybamm.Interpolant):
@@ -19,7 +21,9 @@ class DiscreteTimeData(pybamm.Interpolant):
1921
2022
"""
2123

22-
def __init__(self, time_points: npt.NDArray, data: npt.NDArray, name: str):
24+
def __init__(
25+
self, time_points: npt.NDArray[np.float64], data: npt.NDArray[Any], name: str
26+
):
2327
super().__init__(time_points, data, pybamm.t, name)
2428

2529
def create_copy(self, new_children=None, perform_simplifications=True):

‎src/pybamm/expression_tree/functions.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ def _function_jac(self, children_jacs):
123123
def evaluate(
124124
self,
125125
t: float | None = None,
126-
y: npt.NDArray | None = None,
127-
y_dot: npt.NDArray | None = None,
126+
y: npt.NDArray[np.float64] | None = None,
127+
y_dot: npt.NDArray[np.float64] | None = None,
128128
inputs: dict | str | None = None,
129129
):
130130
"""See :meth:`pybamm.Symbol.evaluate()`."""

‎src/pybamm/expression_tree/independent_variable.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#
44
from __future__ import annotations
55
import sympy
6+
import numpy as np
67
import numpy.typing as npt
78
import pybamm
89
from pybamm.type_definitions import DomainType, AuxiliaryDomainType, DomainsType
@@ -93,8 +94,8 @@ def create_copy(
9394
def _base_evaluate(
9495
self,
9596
t: float | None = None,
96-
y: npt.NDArray | None = None,
97-
y_dot: npt.NDArray | None = None,
97+
y: npt.NDArray[np.float64] | None = None,
98+
y_dot: npt.NDArray[np.float64] | None = None,
9899
inputs: dict | str | None = None,
99100
):
100101
"""See :meth:`pybamm.Symbol._base_evaluate()`."""

0 commit comments

Comments
 (0)