ignore spurious type errors with numpy 2.2

Author: amorison

src/stagpy/dimensions.py

@@ -43,7 +43,7 @@ def make_dimensional(self, data: T, unit: str, scaling: Scaling) -> tuple[T, str
         if factor in phyvars.PREFIXES:
             scale *= 10 ** (-3 * (phyvars.PREFIXES.index(factor) + 1))
             unit = factor + unit
-        return data * scale, unit
+        return data * scale, unit  # type: ignore
 
     @cached_property
     def length(self) -> float:

src/stagpy/field.py

@@ -213,7 +213,7 @@ def plot_scalar(
     # interpolate at cell centers, this should be abstracted by field objects
     # via an "at_cell_centers" method or similar
     if fld.shape[0] > max(step.geom.nxtot, step.geom.nytot):
-        fld = (fld[:-1] + fld[1:]) / 2
+        fld: NDArray[np.float64] = (fld[:-1] + fld[1:]) / 2  # type: ignore
 
     xmin, xmax = xmesh.min(), xmesh.max()
     ymin, ymax = ymesh.min(), ymesh.max()

src/stagpy/plates.py

@@ -284,7 +284,7 @@ def _write_trench_diagnostics(
 
     # vphi at trenches
     vphi = step.fields["v2"].values[0, :, isurf, 0]
-    vphi = (vphi[1:] + vphi[:-1]) / 2
+    vphi: NDArray[np.float64] = (vphi[1:] + vphi[:-1]) / 2  # type: ignore
     v_trenches = vphi[itrenches]
 
     if "age" in step.fields:

src/stagpy/processing.py

@@ -78,7 +78,7 @@ def ebalance(sdat: StagyyData) -> Tseries:
     ftop = sdat.tseries["ftop"].values * coefsurf
     fbot = sdat.tseries["fbot"].values
     radio = sdat.tseries["H_int"].values
-    ebal = ftop[1:] - fbot[1:] + volume * (dtdt.values - radio[1:])
+    ebal: NDArray[np.float64] = ftop[1:] - fbot[1:] + volume * (dtdt.values - radio[1:])  # type: ignore
     return Tseries(ebal, dtdt.time, Vart("Energy balance", r"$\mathrm{Nu}$", "1"))
 
 
@@ -126,7 +126,7 @@ def _scale_prof(
         return rprof
     if rad is None:
         rad = step.rprofs.centers
-    return rprof * (2 * rad / (rtop + rbot)) ** 2
+    return rprof * (2 * rad / (rtop + rbot)) ** 2  # type: ignore
 
 
 def diff_prof(step: Step) -> Rprof:
@@ -234,7 +234,7 @@ def energy_prof(step: Step) -> Rprof:
     diff_p = diffs_prof(step)
     adv_p = advts_prof(step)
     return Rprof(
-        diff_p.values + np.append(adv_p.values, 0),
+        diff_p.values + np.append(adv_p.values, 0),  # type: ignore
         diff_p.rad,
         Varr("Total heat flux", "Heat flux", "W/m2"),
     )

src/stagpy/rprof.py

@@ -5,6 +5,7 @@
 import typing
 
 import matplotlib.pyplot as plt
+import numpy as np
 
 from . import _helpers
 from .config import Config
@@ -13,6 +14,8 @@
 if typing.TYPE_CHECKING:
     from collections.abc import Sequence
 
+    from numpy.typing import NDArray
+
     from .step import Rprofs, Step
 
 
@@ -48,7 +51,7 @@ def plot_rprofs(
                 rad = rpf.rad
                 meta = rpf.meta
                 if conf.rprof.depth:
-                    rad = rprofs.bounds[1] - rad
+                    rad: NDArray[np.float64] = rprofs.bounds[1] - rad  # type: ignore
                 axes[iplt].plot(rprof, rad, conf.rprof.style, label=meta.description)
                 if xlabel is None:
                     xlabel = meta.kind

src/stagpy/step.py

@@ -152,7 +152,7 @@ def t_walls(self) -> NDArray[np.float64]:
     @cached_property
     def t_centers(self) -> NDArray[np.float64]:
         """Position of FV centers along x/theta."""
-        return (self.t_walls[:-1] + self.t_walls[1:]) / 2
+        return (self.t_walls[:-1] + self.t_walls[1:]) / 2  # type: ignore
 
     @cached_property
     def p_walls(self) -> NDArray[np.float64]:
@@ -174,7 +174,7 @@ def p_walls(self) -> NDArray[np.float64]:
     @cached_property
     def p_centers(self) -> NDArray[np.float64]:
         """Position of FV centers along y/phi."""
-        return (self.p_walls[:-1] + self.p_walls[1:]) / 2
+        return (self.p_walls[:-1] + self.p_walls[1:]) / 2  # type: ignore
 
     @property
     def z_walls(self) -> NDArray[np.float64]:
@@ -516,7 +516,7 @@ def stepstr(self) -> str:
     @cached_property
     def centers(self) -> NDArray[np.float64]:
         """Radial position of cell centers."""
-        return self._rprofs["r"].to_numpy() + self.bounds[0]
+        return self._rprofs["r"].to_numpy() + self.bounds[0]  # type: ignore
 
     @cached_property
     def walls(self) -> NDArray[np.float64]:
@@ -528,9 +528,9 @@ def walls(self) -> NDArray[np.float64]:
             # assume walls are mid-way between T-nodes
             # could be T-nodes at center between walls
             centers = self.centers
-            walls = (centers[:-1] + centers[1:]) / 2
+            walls: NDArray[np.float64] = (centers[:-1] + centers[1:]) / 2  # type: ignore
             walls = np.insert(walls, 0, rbot)
-            walls = np.append(walls, rtop)
+            walls: NDArray[np.float64] = np.append(walls, rtop)  # type: ignore
         return walls
 
     @cached_property