linerate 2.2.0__tar.gz → 3.0.0__tar.gz

{linerate-2.2.0 → linerate-3.0.0}/.github/workflows/tests.yml

@@ -1,10 +1,10 @@
 ---
-  name: Lint and Test
+  name: Lint, type check and test
 
   on: [push, pull_request]
 
   jobs:
-    lint:
+    lint-and-type-check:
       runs-on: ubuntu-latest
       strategy:
         matrix:
@@ -17,7 +17,7 @@
           uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6
           with:
             python-version: ${{ matrix.python-version }}
-        - name: Run linting
+        - name: Run linting and type checking
           run: |
             uv run --frozen pre-commit run --all-files
 

{linerate-2.2.0 → linerate-3.0.0}/.pre-commit-config.yaml

@@ -21,3 +21,7 @@ repos:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
       - id: ruff-format
+  - repo: https://github.com/RobertCraigie/pyright-python
+    rev: v1.1.408
+    hooks:
+      - id: pyright

{linerate-2.2.0 → linerate-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: linerate
-Version: 2.2.0
+Version: 3.0.0
 Summary: Library for computing line ampacity ratings for overhead lines
 Author-email: Statnett Datascience <Datascience.Drift@Statnett.no>, Yngve Mardal Moe <yngve.m.moe@gmail.com>
 Requires-Python: >=3.9

{linerate-2.2.0 → linerate-3.0.0}/examples/plot_solar_heating_comparison.py

@@ -73,7 +73,10 @@ for k, v in vals_with_range.items():
     # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     P_s_cigre = solar_heating.compute_solar_heating(alpha_s, I_T, D)
+    assert isinstance(P_s_cigre, np.ndarray)
+
     P_s_ieee = ieee738.solar_heating.compute_solar_heating(alpha_s, Q_se, cos_theta, D)
+    assert isinstance(P_s_ieee, np.ndarray)
 
     ###############################################################################
     # Create visualisation
@@ -92,7 +95,7 @@ for k, v in vals_with_range.items():
         )
     elif k == "sin_H_s":
         plt.xlabel("Solar altitude [$^\\circ$]")
-        plt.xticks(ticks=[0, 1 / 3, 2 / 3, 1], labels=[0, 30, 60, 90])
+        plt.xticks(ticks=[0, 1 / 3, 2 / 3, 1], labels=["0", "30", "60", "90"])
         plt.title(
             r"Solar heating calculated using the CIGRE-601 and the IEEE-736 standards."
             "\n"

{linerate-2.2.0 → linerate-3.0.0}/examples/plot_solar_radiation.py

@@ -11,7 +11,6 @@ the difference between the solar azimuth and the span azimuth (or bearing),
 # Imports and utilities
 # ^^^^^^^^^^^^^^^^^^^^^
 
-import matplotlib.cm as cm
 import matplotlib.pyplot as plt
 import numpy as np
 
@@ -45,9 +44,12 @@ I_d = cigre601.solar_heating.compute_diffuse_sky_radiation(I_B, sin_H_s)
 I_T_F0 = cigre601.solar_heating.compute_global_radiation_intensity(
     I_B, I_d, albedo=0.0, sin_angle_of_sun_on_line=sin_eta, sin_solar_altitude=sin_H_s
 )
+assert isinstance(I_T_F0, np.ndarray)
+
 I_T_F = cigre601.solar_heating.compute_global_radiation_intensity(
     I_B, I_d, albedo=albedo, sin_angle_of_sun_on_line=sin_eta, sin_solar_altitude=sin_H_s
 )
+assert isinstance(I_T_F, np.ndarray)
 
 ###############################################################################
 # Create visualisation
@@ -57,19 +59,20 @@ I_T_F = cigre601.solar_heating.compute_global_radiation_intensity(
 
 # Setup figure and axes
 fig = plt.figure(figsize=(11, 1.9))
-axes = [fig.add_axes([0.07, 0.27, 0.19, 0.7])]
+axes = [fig.add_axes((0.07, 0.27, 0.19, 0.7))]
 axes += [
-    fig.add_axes([0.30, 0.27, 0.18, 0.7], sharey=axes[0]),
-    fig.add_axes([0.53, 0.27, 0.18, 0.7], sharey=axes[0]),
-    fig.add_axes([0.76, 0.27, 0.18, 0.7], sharey=axes[0]),
+    fig.add_axes((0.30, 0.27, 0.18, 0.7), sharey=axes[0]),
+    fig.add_axes((0.53, 0.27, 0.18, 0.7), sharey=axes[0]),
+    fig.add_axes((0.76, 0.27, 0.18, 0.7), sharey=axes[0]),
 ]
-cbar_ax = fig.add_axes([0.955, 0.27, 0.015, 0.7])
+cbar_ax = fig.add_axes((0.955, 0.27, 0.015, 0.7))
 
 # Add plots
 axes[0].plot(np.degrees(solar_altitude), I_B, color="k")
 axes[1].plot(np.degrees(solar_altitude), I_d, color="k")
+cmap = plt.get_cmap("cividis")
 for i, d_gamma in enumerate(azimuth_difference.ravel()):
-    color = cm.cividis(d_gamma / azimuth_difference.max())
+    color = cmap(d_gamma / azimuth_difference.max())
     d_gamma = np.degrees(d_gamma)
     axes[2].plot(np.degrees(solar_altitude), I_T_F0[:, i], color=color)
     axes[3].plot(np.degrees(solar_altitude), I_T_F[:, i], color=color)
@@ -84,7 +87,7 @@ for ax in axes:
     # Setup y-axes to be shared
     ax.set_ylim(0, I_T_F.max() * 1.05)
     ax.set_yticks([0, 500, 1000, 1360])  # Include tick for solar constant
-    ax.set_yticklabels([0, 500, 1000, "$G_{SC}$"])
+    ax.set_yticklabels(["0", "500", "1000", "$G_{SC}$"])
     ax.axhline(1360, color="k", linestyle="--")  # Add dashed line for solar constant
 
 
@@ -96,8 +99,8 @@ axes[3].tick_params(labelleft=False)
 # Setup labels
 axes[0].set_ylabel(r"$I_B~[\mathrm{W}~\mathrm{m}^{-1}]$", labelpad=-1)
 axes[1].set_ylabel(r"$I_d~[\mathrm{W}~\mathrm{m}^{-1}]$")
-axes[2].set_ylabel("$F=0$\n$I_T~[\mathrm{W}~\mathrm{m}^{-1}]$")  # noqa
-axes[3].set_ylabel(f"$F={albedo}$\n$I_T~[\mathrm{{W}}~\mathrm{{m}}^{{-1}}]$")  # noqa
+axes[2].set_ylabel(r"$F=0$\n$I_T~[\mathrm{W}~\mathrm{m}^{-1}]$")  # noqa
+axes[3].set_ylabel(rf"$F={albedo}$\n$I_T~[\mathrm{{W}}~\mathrm{{m}}^{{-1}}]$")  # noqa
 
 # Colorbar
 cbar_ax.imshow(azimuth_difference.T, aspect="auto", cmap="cividis")
@@ -105,7 +108,7 @@ cbar_ax.yaxis.set_label_position("right")
 cbar_ax.set_ylabel(r"$\left|\gamma_c - \gamma_s\right|~[^\circ]$", labelpad=-10)
 cbar_ax.yaxis.tick_right()
 cbar_ax.set_yticks(cbar_ax.get_ylim())
-cbar_ax.set_yticklabels([0, 90])
+cbar_ax.set_yticklabels(["0", "90"])
 cbar_ax.set_xticks([])
 
 plt.show()

{linerate-2.2.0 → linerate-3.0.0}/linerate/equations/ieee738/convective_cooling.py

@@ -190,7 +190,7 @@ def compute_forced_convection(  # q_c1 or q_c2
     q_c1 = K_angle * (1.01 + 1.35 * N_Re**0.52) * k_f * (T_s - T_a)
     q_c2 = K_angle * 0.754 * N_Re**0.6 * k_f * (T_s - T_a)
 
-    if hasattr(q_c1, "__len__"):
+    if isinstance(q_c1, np.ndarray) and isinstance(q_c2, np.ndarray):
         q_cf = []
         for i in range(len(q_c1)):
             if q_c1[i] > q_c2[i]:

{linerate-2.2.0 → linerate-3.0.0}/linerate/equations/solar_angles.py

@@ -1,16 +1,17 @@
 import numpy as np
 from numba import vectorize
+
 from linerate.equations import math
 
-from ..units import Date, Degrees, Radian, Unitless
 from ..types import Span
+from ..units import Date, Degrees, Radian, Unitless
 
 
 def _get_day_of_year(when: Date) -> Unitless:
     YearResolutionType = np.datetime64(1, "Y")
     DayResolutionType = np.datetime64(1, "D")
 
-    return (when.astype(DayResolutionType) - when.astype(YearResolutionType)).astype(float) + 1
+    return (when.astype(DayResolutionType) - when.astype(YearResolutionType)).astype(float) + 1.0
 
 
 def _get_hour_of_day(when: Date) -> Unitless:
@@ -55,9 +56,11 @@ def compute_hour_angle_relative_to_noon(when: Date, longitude: Degrees) -> Radia
     utc_minute = _get_minute_of_hour(when)
     pi = np.pi
     # We add longitude/15 since 15 degrees of longitude increases solar hour by 1
-    return np.mod((-12 + utc_hour + utc_minute / 60 + longitude / 15), 24) * (
+    hour_angle = np.mod((-12 + utc_hour + utc_minute / 60 + longitude / 15), 24) * (
         pi / 12
     )  # pi/12 is 15 degrees
+    # Shift to [-pi, pi] range to ensure negative values before noon
+    return np.where(hour_angle >= pi, hour_angle - 2 * pi, hour_angle)
 
 
 def compute_solar_declination(
@@ -123,13 +126,16 @@ def _compute_solar_azimuth_constant(
     if -pi <= omega < 0:
         if chi >= 0:
             C = 0
-        elif chi < 0:
+        else:
             C = pi
     elif 0 <= omega < pi:
         if chi >= 0:
             C = pi
-        elif chi < 0:
+        else:
             C = 2 * pi
+    else:
+        raise ValueError(f"Hour angle {omega} out of range [-π, π)")
+
     return C
 
 
@@ -138,7 +144,7 @@ def compute_solar_azimuth_constant(
 ) -> Radian:
     r"""Compute the solar azimuth constant.
 
-    Table 2 on page 18 of:cite:p:`ieee738`.
+    Table 2 on page 18 of :cite:p:`ieee738`.
 
     Parameters
     ----------

{linerate-2.2.0 → linerate-3.0.0}/linerate/models/cigre207.py

@@ -35,9 +35,7 @@ class Cigre207(ThermalModel):
         )
 
     @_copy_method_docstring(ThermalModel)
-    def compute_solar_heating(
-        self, conductor_temperature: Celsius, current: Ampere
-    ) -> WattPerMeter:
+    def compute_solar_heating(self) -> WattPerMeter:
         alpha_s = self.span.conductor.solar_absorptivity
         phi = self.span.latitude
         gamma_c = self.span.conductor_azimuth
@@ -60,7 +58,7 @@ class Cigre207(ThermalModel):
         )
         if self.include_diffuse_radiation:
             I_d = cigre207.solar_heating.compute_diffuse_sky_radiation(I_B, sin_H_s)
-            F = self.span.ground_albedo
+            F = self.weather.ground_albedo
         else:
             I_d = 0
             F = 0
@@ -74,9 +72,7 @@ class Cigre207(ThermalModel):
         )
 
     @_copy_method_docstring(ThermalModel)
-    def compute_convective_cooling(
-        self, conductor_temperature: Celsius, current: Ampere
-    ) -> WattPerMeter:
+    def compute_convective_cooling(self, conductor_temperature: Celsius) -> WattPerMeter:
         D = self.span.conductor.conductor_diameter
         d = self.span.conductor.outer_layer_strand_diameter
         V = self.weather.wind_speed
@@ -126,10 +122,11 @@ class Cigre207(ThermalModel):
 
     @_copy_method_docstring(ThermalModel)
     def compute_radiative_cooling(
-        self, conductor_temperature: Celsius, current: Ampere
+        self,
+        conductor_temperature: Celsius,
     ) -> WattPerMeter:
         return super().compute_radiative_cooling(
-            conductor_temperature=conductor_temperature, current=current
+            conductor_temperature=conductor_temperature,
         )
 
     @_copy_method_docstring(ThermalModel)

{linerate-2.2.0 → linerate-3.0.0}/linerate/models/cigre601.py

@@ -1,5 +1,3 @@
-from numbers import Real
-
 import numpy as np
 
 from linerate.equations import (
@@ -11,24 +9,27 @@ from linerate.equations import (
     solar_heating,
 )
 from linerate.models.thermal_model import ThermalModel, _copy_method_docstring
-from linerate.types import Span, Weather, WeatherWithSolarRadiation
+from linerate.types import BaseWeather, Span, Weather, WeatherWithSolarRadiation
 from linerate.units import (
     Ampere,
     Celsius,
     Date,
     JoulePerKilogramPerKelvin,
     OhmPerMeter,
+    Unitless,
     WattPerMeter,
 )
 
 
-class Cigre601(ThermalModel):
+class BaseCigre601(ThermalModel):
+    DEFAULT_MAX_REYNOLDS_NUMBER = 4000.0  # Max value of the angle correction in CIGRE601
+
     def __init__(
         self,
         span: Span,
-        weather: Weather,
+        weather: BaseWeather,
         time: Date,
-        max_reynolds_number: Real = 4000,  # Max value of the angle correction in CIGRE601
+        max_reynolds_number: Unitless = DEFAULT_MAX_REYNOLDS_NUMBER,
     ):
         super().__init__(span, weather)
         self.time = time
@@ -48,36 +49,10 @@ class Cigre601(ThermalModel):
             conductor_temperature=conductor_temperature, current=current
         )
 
-    @_copy_method_docstring(ThermalModel)
-    def compute_solar_heating(
-        self, conductor_temperature: Celsius, current: Ampere
-    ) -> WattPerMeter:
-        alpha_s = self.span.conductor.solar_absorptivity
-        F = self.weather.ground_albedo
-        y = self.span.conductor_altitude
-        N_s = self.weather.clearness_ratio
-        D = self.span.conductor.conductor_diameter
-
-        sin_H_s = solar_angles.compute_sin_solar_altitude_for_span(self.span, self.time)
-
-        sin_eta = solar_angles.compute_sin_solar_effective_incidence_angle_for_span(
-            self.span, self.time, sin_H_s
-        )
-
-        I_B = cigre601.solar_heating.compute_direct_solar_radiation(sin_H_s, N_s, y)
-        I_d = cigre601.solar_heating.compute_diffuse_sky_radiation(I_B, sin_H_s)
-        I_T = cigre601.solar_heating.compute_global_radiation_intensity(
-            I_B, I_d, F, sin_eta, sin_H_s
-        )
-        return solar_heating.compute_solar_heating(
-            alpha_s,
-            I_T,
-            D,
-        )
-
     @_copy_method_docstring(ThermalModel)
     def compute_convective_cooling(
-        self, conductor_temperature: Celsius, current: Ampere
+        self,
+        conductor_temperature: Celsius,
     ) -> WattPerMeter:
         D = self.span.conductor.conductor_diameter
         d = self.span.conductor.outer_layer_strand_diameter
@@ -133,10 +108,11 @@ class Cigre601(ThermalModel):
 
     @_copy_method_docstring(ThermalModel)
     def compute_radiative_cooling(
-        self, conductor_temperature: Celsius, current: Ampere
+        self,
+        conductor_temperature: Celsius,
     ) -> WattPerMeter:
         return super().compute_radiative_cooling(
-            conductor_temperature=conductor_temperature, current=current
+            conductor_temperature=conductor_temperature,
         )
 
     def compute_temperature_gradient(
@@ -169,17 +145,64 @@ class Cigre601(ThermalModel):
         )
 
 
-class Cigre601WithSolarRadiation(Cigre601):
-    """Extension of the Cigre601 model that accepts external solar radiation data for direct and diffuse solar
+class Cigre601(BaseCigre601):
+    """Extension of the BaseCigre601 model that uses the solar radiation parametrisation in CIGRE601."""
+
+    def __init__(
+        self,
+        span: Span,
+        weather: Weather,
+        time: Date,
+        max_reynolds_number: Unitless = BaseCigre601.DEFAULT_MAX_REYNOLDS_NUMBER,
+    ):
+        self.span = span
+        self.weather = weather
+        self.time = time
+        self.max_reynolds_number = max_reynolds_number
+
+    @_copy_method_docstring(ThermalModel)
+    def compute_solar_heating(self) -> WattPerMeter:
+        alpha_s = self.span.conductor.solar_absorptivity
+        F = self.weather.ground_albedo
+        y = self.span.conductor_altitude
+        N_s = self.weather.clearness_ratio
+        D = self.span.conductor.conductor_diameter
+
+        sin_H_s = solar_angles.compute_sin_solar_altitude_for_span(self.span, self.time)
+
+        sin_eta = solar_angles.compute_sin_solar_effective_incidence_angle_for_span(
+            self.span, self.time, sin_H_s
+        )
+
+        I_B = cigre601.solar_heating.compute_direct_solar_radiation(sin_H_s, N_s, y)
+        I_d = cigre601.solar_heating.compute_diffuse_sky_radiation(I_B, sin_H_s)
+        I_T = cigre601.solar_heating.compute_global_radiation_intensity(
+            I_B, I_d, F, sin_eta, sin_H_s
+        )
+        return solar_heating.compute_solar_heating(
+            alpha_s,
+            I_T,
+            D,
+        )
+
+
+class Cigre601WithSolarRadiation(BaseCigre601):
+    """Extension of the BaseCigre601 model that accepts external solar radiation data for direct and diffuse solar
     radiation."""
 
-    def __init__(self, span: Span, weather: WeatherWithSolarRadiation, time: Date):
-        super().__init__(span, weather, time)
+    def __init__(
+        self,
+        span: Span,
+        weather: WeatherWithSolarRadiation,
+        time: Date,
+        max_reynolds_number: Unitless = BaseCigre601.DEFAULT_MAX_REYNOLDS_NUMBER,
+    ):
+        self.span = span
         self.weather = weather
+        self.time = time
+        self.max_reynolds_number = max_reynolds_number
 
-    def compute_solar_heating(
-        self, conductor_temperature: Celsius, current: Ampere
-    ) -> WattPerMeter:
+    def compute_solar_heating(self) -> WattPerMeter:
         alpha_s = self.span.conductor.solar_absorptivity
         F = self.weather.ground_albedo
         D = self.span.conductor.conductor_diameter

{linerate-2.2.0 → linerate-3.0.0}/linerate/models/ieee738.py

@@ -1,11 +1,9 @@
-from numbers import Real
-
 import numpy as np
 
 from linerate.equations import dimensionless, ieee738, math, solar_angles
 from linerate.models.thermal_model import ThermalModel, _copy_method_docstring
 from linerate.types import Span, Weather
-from linerate.units import Ampere, Celsius, Date, OhmPerMeter, WattPerMeter
+from linerate.units import Ampere, Celsius, Date, OhmPerMeter, Unitless, WattPerMeter
 
 
 class IEEE738(ThermalModel):
@@ -14,7 +12,7 @@ class IEEE738(ThermalModel):
         span: Span,
         weather: Weather,
         time: Date,
-        max_reynolds_number: Real = 50_000,  # Max Reynolds number for forced convection
+        max_reynolds_number: Unitless = 50_000.0,  # Max Reynolds number for forced convection
     ):
         super().__init__(span, weather)
         self.time = time
@@ -36,7 +34,7 @@ class IEEE738(ThermalModel):
 
     @_copy_method_docstring(ThermalModel)
     def compute_solar_heating(
-        self, conductor_temperature: Celsius, current: Ampere
+        self,
     ) -> WattPerMeter:
         alpha_s = self.span.conductor.solar_absorptivity  # alpha in IEEE
         phi = self.span.latitude  # Lat in IEEE
@@ -58,9 +56,7 @@ class IEEE738(ThermalModel):
         return ieee738.solar_heating.compute_solar_heating(alpha_s, Q_se, cos_theta, D)
 
     @_copy_method_docstring(ThermalModel)
-    def compute_convective_cooling(
-        self, conductor_temperature: Celsius, current: Ampere
-    ) -> WattPerMeter:
+    def compute_convective_cooling(self, conductor_temperature: Celsius) -> WattPerMeter:
         D = self.span.conductor.conductor_diameter  # D_0 in IEEE
         y = self.span.conductor_altitude  # H_e in IEEE
         V = self.weather.wind_speed  # V_w in IEEE
@@ -85,9 +81,7 @@ class IEEE738(ThermalModel):
         return ieee738.convective_cooling.compute_convective_cooling(q_cf, q_cn)
 
     @_copy_method_docstring(ThermalModel)
-    def compute_radiative_cooling(
-        self, conductor_temperature: Celsius, current: Ampere
-    ) -> WattPerMeter:
+    def compute_radiative_cooling(self, conductor_temperature: Celsius) -> WattPerMeter:
         return super().compute_radiative_cooling(
-            conductor_temperature=conductor_temperature, current=current
+            conductor_temperature=conductor_temperature,
         )

{linerate-2.2.0 → linerate-3.0.0}/linerate/models/thermal_model.py

@@ -3,7 +3,7 @@ from typing import Dict
 
 from linerate import solver
 from linerate.equations import joule_heating, radiative_cooling
-from linerate.types import Span, Weather
+from linerate.types import BaseWeather, Span
 from linerate.units import Ampere, Celsius, OhmPerMeter, WattPerMeter
 
 
@@ -19,7 +19,7 @@ class ThermalModel(ABC):
     """Abstract class for a minimal conductor thermal model."""
 
     @abstractmethod
-    def __init__(self, span: Span, weather: Weather):
+    def __init__(self, span: Span, weather: BaseWeather):
         self.span = span
         self.weather = weather
 
@@ -84,17 +84,10 @@ class ThermalModel(ABC):
 
     @abstractmethod
     def compute_solar_heating(
-        self, conductor_temperature: Celsius, current: Ampere
+        self,
     ) -> WattPerMeter:
         r"""Compute the solar heating, :math:`P_S~\left[\text{W}~\text{m}^{-1}\right]`.
 
-        Parameters
-        ----------
-        conductor_temperature:
-            :math:`T_\text{av}~\left[^\circ\text{C}\right]`. The average conductor temperature.
-        current:
-            :math:`I~\left[\text{A}\right]`. The current.
-
         Returns
         -------
         Union[float, float64, ndarray[Any, dtype[float64]]]
@@ -104,7 +97,8 @@ class ThermalModel(ABC):
 
     @abstractmethod
     def compute_convective_cooling(
-        self, conductor_temperature: Celsius, current: Ampere
+        self,
+        conductor_temperature: Celsius,
     ) -> WattPerMeter:
         r"""Compute the convective cooling, :math:`P_c~\left[\text{W}~\text{m}^{-1}\right]`.
 
@@ -112,8 +106,6 @@ class ThermalModel(ABC):
         ----------
         conductor_temperature:
             :math:`T_\text{av}~\left[^\circ\text{C}\right]`. The average conductor temperature.
-        current:
-            :math:`I~\left[\text{A}\right]`. The current.
 
         Returns
         -------
@@ -124,7 +116,8 @@ class ThermalModel(ABC):
 
     @abstractmethod
     def compute_radiative_cooling(
-        self, conductor_temperature: Celsius, current: Ampere
+        self,
+        conductor_temperature: Celsius,
     ) -> WattPerMeter:
         r"""Compute the radiative cooling, :math:`P_r~\left[\text{W}~\text{m}^{-1}\right]`.
 
@@ -132,8 +125,6 @@ class ThermalModel(ABC):
         ----------
         conductor_temperature:
             :math:`T_\text{av}~\left[^\circ\text{C}\right]`. The average conductor temperature.
-        current:
-            :math:`I~\left[\text{A}\right]`. The current.
 
         Returns
         -------
@@ -163,9 +154,9 @@ class ThermalModel(ABC):
             :math:`P_J + P_s - P_c - P_r~\left[\text{W}~\text{m}^{-1}\right]`. The heat balance.
         """
         P_j = self.compute_joule_heating(conductor_temperature, current)
-        P_s = self.compute_solar_heating(conductor_temperature, current)
-        P_c = self.compute_convective_cooling(conductor_temperature, current)
-        P_r = self.compute_radiative_cooling(conductor_temperature, current)
+        P_s = self.compute_solar_heating()
+        P_c = self.compute_convective_cooling(conductor_temperature)
+        P_r = self.compute_radiative_cooling(conductor_temperature)
         return P_j + P_s - P_c - P_r
 
     def compute_info(
@@ -186,10 +177,10 @@ class ThermalModel(ABC):
             A dictionary with the magnitude of the different heating and cooling effects.
         """
         return {
-            "convective_cooling": self.compute_convective_cooling(conductor_temperature, current),
-            "radiative_cooling": self.compute_radiative_cooling(conductor_temperature, current),
+            "convective_cooling": self.compute_convective_cooling(conductor_temperature),
+            "radiative_cooling": self.compute_radiative_cooling(conductor_temperature),
             "joule_heating": self.compute_joule_heating(conductor_temperature, current),
-            "solar_heating": self.compute_solar_heating(conductor_temperature, current),
+            "solar_heating": self.compute_solar_heating(),
         }
 
     def compute_steady_state_ampacity(

{linerate-2.2.0 → linerate-3.0.0}/linerate/solver.py

@@ -114,7 +114,9 @@ def compute_conductor_temperature(
     Union[float, float64, ndarray[Any, dtype[float64]]]
         :math:`I~\left[\text{A}\right]`. The thermal rating.
     """
-    f = partial(heat_balance, current=current)
+
+    def f(conductor_temperature: Celsius) -> WattPerMeter:
+        return heat_balance(conductor_temperature, current)
 
     return bisect(f, min_temperature, max_temperature, tolerance)
 

{linerate-2.2.0 → linerate-3.0.0}/linerate/types.py

@@ -163,8 +163,8 @@ class Span:
         return 0.5 * (self.start_tower.altitude + self.end_tower.altitude)
 
 
-@dataclass()
-class Weather:
+@dataclass
+class BaseWeather:
     #: :math:`T_a~\left[^\circ C\right]`. The ambient air temperature.
     air_temperature: Celsius
     #: :math:`\delta~\left[\text{radian}\right]`. Wind direction east of north.
@@ -173,24 +173,21 @@ class Weather:
     wind_speed: MeterPerSecond
     #: :math:`F`.  The ground albedo.
     ground_albedo: Unitless
+
+
+@dataclass
+class Weather(BaseWeather):
     #: :math:`N_s`. The clearness ratio (or clearness number in
     #: :cite:p:`sharma1965interrelationships,cigre207`).
     clearness_ratio: Unitless = 1
 
 
 @dataclass
-class WeatherWithSolarRadiation(Weather):
+class WeatherWithSolarRadiation(BaseWeather):
     """Extension of the Weather class to accept solar radiation timeseries."""
 
     #: :math:`I_d~\left[\text{W}~\text{m}^{-2}\right]`. The diffuse radiation intensity.
-    diffuse_radiation_intensity: WattPerSquareMeter = None
+    diffuse_radiation_intensity: WattPerSquareMeter
     #: :math:`I_B~\left[\text{W}~\text{m}^{-2}\right]`. The direct radiation intensity on a surface normal to the
     # sun's beam.
-    direct_radiation_intensity: WattPerSquareMeter = None
-
-    def __post_init__(self):
-        if (self.diffuse_radiation_intensity is None) or (self.direct_radiation_intensity is None):
-            raise ValueError(
-                "Both 'diffuse_radiation_intensity' and 'direct_radiation_intensity' must be provided. For weather"
-                " data without solar radiation, use the 'Weather' class instead.",
-            )
+    direct_radiation_intensity: WattPerSquareMeter

{linerate-2.2.0 → linerate-3.0.0}/linerate/units.py

@@ -8,10 +8,11 @@ except ImportError:  # Python version <3.9
 import numpy as np
 import numpy.typing as npt
 
-FloatOrFloatArray = Union[float, np.float64, npt.NDArray[np.float64]]
+FloatOrFloatArray = Union[float, np.floating, npt.NDArray[np.floating]]
 BoolOrBoolArray = Union[bool, np.bool_, npt.NDArray[np.bool_]]
 
 OhmPerMeter = Annotated[FloatOrFloatArray, "Ω/m"]
+OhmPerMeterPerCelsius = Annotated[FloatOrFloatArray, "Ω/(m °C)"]
 Ampere = Annotated[FloatOrFloatArray, "A"]
 Radian = Annotated[FloatOrFloatArray, "rad"]
 Degrees = Annotated[FloatOrFloatArray, "°"]

{linerate-2.2.0 → linerate-3.0.0}/linerate.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: linerate
-Version: 2.2.0
+Version: 3.0.0
 Summary: Library for computing line ampacity ratings for overhead lines
 Author-email: Statnett Datascience <Datascience.Drift@Statnett.no>, Yngve Mardal Moe <yngve.m.moe@gmail.com>
 Requires-Python: >=3.9

{linerate-2.2.0 → linerate-3.0.0}/linerate.egg-info/SOURCES.txt

@@ -98,4 +98,5 @@ tests/equations/cigre601/test_solar_heating.py
 tests/equations/ieee738/test_ieee_convective_cooling.py
 tests/equations/ieee738/test_solar_heating.py
 tests/integration_tests/test_vectorization.py
+tests/models/test_cigre601_with_solar_radiation.py
 tests/models/test_thermal_model.py

{linerate-2.2.0 → linerate-3.0.0}/pyproject.toml

@@ -24,6 +24,8 @@ dev = [
   "pytest==8.4.2",
   "pytest-cov==7.0.0",
   "pytest-randomly==4.0.1",
+  "pyright[nodejs]",
+  "matplotlib>=3.9.4",
 ]
 docs = [
   "sphinx",
@@ -94,3 +96,7 @@ filterwarnings = [
 [build-system]
 requires = ["setuptools>=64", "setuptools-scm>=8"]
 build-backend = "setuptools.build_meta"
+
+[tool.pyright]
+venvPath = "."
+venv = ".venv"