linerate 2.2.1__py3-none-any.whl → 3.0.0__py3-none-any.whl

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
@@ -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/models/cigre601.py

@@ -22,12 +22,14 @@ from linerate.units import (
 
 
 class BaseCigre601(ThermalModel):
+    DEFAULT_MAX_REYNOLDS_NUMBER = 4000.0  # Max value of the angle correction in CIGRE601
+
     def __init__(
         self,
         span: Span,
         weather: BaseWeather,
         time: Date,
-        max_reynolds_number: Unitless = 4000.0,  # Max value of the angle correction in CIGRE601
+        max_reynolds_number: Unitless = DEFAULT_MAX_REYNOLDS_NUMBER,
     ):
         super().__init__(span, weather)
         self.time = time
@@ -49,7 +51,8 @@ class BaseCigre601(ThermalModel):
 
     @_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
@@ -105,10 +108,11 @@ class BaseCigre601(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(
@@ -142,12 +146,14 @@ class BaseCigre601(ThermalModel):
 
 
 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 = 4000.0,  # Max value of the angle correction in CIGRE601
+        max_reynolds_number: Unitless = BaseCigre601.DEFAULT_MAX_REYNOLDS_NUMBER,
     ):
         self.span = span
         self.weather = weather
@@ -155,9 +161,7 @@ class Cigre601(BaseCigre601):
         self.max_reynolds_number = max_reynolds_number
 
     @_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
         F = self.weather.ground_albedo
         y = self.span.conductor_altitude
@@ -183,18 +187,22 @@ class Cigre601(BaseCigre601):
 
 
 class Cigre601WithSolarRadiation(BaseCigre601):
-    """Extension of the Cigre601 model that accepts external solar radiation data for direct and diffuse solar
+    """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):
+    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.weather = weather
+        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/models/ieee738.py

@@ -34,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
@@ -56,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
@@ -83,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/models/thermal_model.py

@@ -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/units.py

@@ -12,6 +12,7 @@ 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.1.dist-info → linerate-3.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: linerate
-Version: 2.2.1
+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.1.dist-info → linerate-3.0.0.dist-info}/RECORD

@@ -3,7 +3,7 @@ linerate/model.py,sha256=SUj4NunXdCctezpGeS62OQNmFGf5IKO2plYQlsGJLow,651
 linerate/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 linerate/solver.py,sha256=cXL7t_Q0otnCJnCScVuo7yWRVHrO4WGlw2DWBYivQA8,6724
 linerate/types.py,sha256=ygFECWP_DX1fWujvIrYPXDf4VcoSCf5T6srEybRomx8,7255
-linerate/units.py,sha256=MyJkBiHDfsJXHga_uW7yAGYVPCWtyfFtPiQxwkXIwl4,1478
+linerate/units.py,sha256=cvBAup0l14xDMecfEM2T6sl3XEwwG5IHNKreR3Drtw0,1545
 linerate/equations/__init__.py,sha256=cNvISWCp5TbXv4gZ8SWPf0pICRpwDzLSaOxYy5lftsU,464
 linerate/equations/convective_cooling.py,sha256=K6-PxzUHBPOfGloE_uwao5dV0JuHFUmu3Pp_31qUi1g,1387
 linerate/equations/dimensionless.py,sha256=omvurTJUfCMLwqQNvi4Yz_sVeUXcENqaY6K_3GIuO0Y,5625
@@ -26,12 +26,12 @@ linerate/equations/ieee738/convective_cooling.py,sha256=fKUZVxFHMYSqx2Dmi6bJ1S2n
 linerate/equations/ieee738/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 linerate/equations/ieee738/solar_heating.py,sha256=l3uOUCexDShTW3jOfUw6EOHUY2azWxZuetMdn_8NrmM,4559
 linerate/models/Cigre207.md,sha256=FCKspzRL5zX9kH3gj1D78F6eUHJeET9yuvrhGs-PQBg,1685
-linerate/models/cigre207.py,sha256=vnVtF4Uaxwf9s6sSFeCFb70md-utrXFQTLhWRLoFIUI,5480
-linerate/models/cigre601.py,sha256=aFPiZBnZ6ihQ8bpiToldkhMSfps_8tEuJXxDarJaWK0,7932
-linerate/models/ieee738.py,sha256=5hRsXisb177AdN3xXfL9qBBQxWAVFYl1O2l7fciqiU4,4281
-linerate/models/thermal_model.py,sha256=uRnqDZMQO_YnvPTZ37wEtEF2RHKxbUqUjyrRmz_lO-o,11311
-linerate-2.2.1.dist-info/licenses/LICENSE,sha256=HDUtv1ujna13BmYSP7JtGGsG5kGPAaZY2C2qJrANAOo,1059
-linerate-2.2.1.dist-info/METADATA,sha256=pYArGqT9-_NS9FIv-aYVZein97h6H6kNqG7QNeB1fk0,4285
-linerate-2.2.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-linerate-2.2.1.dist-info/top_level.txt,sha256=xHXGAzhQ04AqJCM-MG30tP_me8vBQ9PMlRWsbMLJdgE,9
-linerate-2.2.1.dist-info/RECORD,,
+linerate/models/cigre207.py,sha256=T0VNoytzxcEl81tyxvkYnBt55pMhuy_nAaGzpUt9W4g,5362
+linerate/models/cigre601.py,sha256=ZwK3YTI_1aPgGcH4Khc6ZCP3PWH7LYtWh1A4AToIxsw,8077
+linerate/models/ieee738.py,sha256=uHYtYoplTVwAMYduiYwRwAvpexnzP6puPIZU6aP-z7o,4155
+linerate/models/thermal_model.py,sha256=swjYA9EyKS05tfwg0wVG-kr9N3iDtfonvzr4-pmseb4,10760
+linerate-3.0.0.dist-info/licenses/LICENSE,sha256=HDUtv1ujna13BmYSP7JtGGsG5kGPAaZY2C2qJrANAOo,1059
+linerate-3.0.0.dist-info/METADATA,sha256=XX-KIV0-vrqI0I3qpCxlDt7Ky3mLpMabSFrpAK9ykVc,4285
+linerate-3.0.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+linerate-3.0.0.dist-info/top_level.txt,sha256=xHXGAzhQ04AqJCM-MG30tP_me8vBQ9PMlRWsbMLJdgE,9
+linerate-3.0.0.dist-info/RECORD,,