Merge pull request #54 from statnett/move-albedo-to-weather

Moved albedo to weather, no longer a conductor parameter.

Author: genisott

README.md

@@ -52,7 +52,6 @@ span = linerate.Span(
     conductor=conductor,
     start_tower=start_tower,
     end_tower=end_tower,
-    ground_albedo=0.15,
     num_conductors=1,
 )
 
@@ -61,6 +60,7 @@ weather = linerate.Weather(
     air_temperature=20,
     wind_direction=np.radians(80),  # Conductor azimuth is 0, so angle of attack is 80
     wind_speed=1.66,
+    ground_albedo=0.15,
     clearness_ratio=0.5,
 )
 

linerate/models/cigre601.py

@@ -54,7 +54,7 @@ def compute_solar_heating(
         self, conductor_temperature: Celsius, current: Ampere
     ) -> WattPerMeter:
         alpha_s = self.span.conductor.solar_absorptivity
-        F = self.span.ground_albedo
+        F = self.weather.ground_albedo
         phi = self.span.latitude
         gamma_c = self.span.conductor_azimuth
         y = self.span.conductor_altitude

linerate/types.py

@@ -104,9 +104,6 @@ class Span:
     #: Container for the metadata of the second tower of the span
     end_tower: Tower
 
-    #: :math:`F`.  The ground albedo.
-    ground_albedo: Unitless
-
     #: Number of conductors in the span. 1 for simplex, 2 for duplex and 3 for triplex.
     num_conductors: Unitless
 
@@ -173,6 +170,8 @@ class Weather:
     wind_direction: Radian
     #: :math:`v~\left[\text{m}~\text{s}^{-1}\right]`. Wind velocity
     wind_speed: MeterPerSecond
+    #: :math:`F`.  The ground albedo.
+    ground_albedo: Unitless
     #: :math:`N_s`. The clearness ratio (or clearness number in
     #: :cite:p:`sharma1965interrelationships,cigre207`).
     clearness_ratio: Unitless = 1

tests/acceptance_tests/test_cigre_ampacity_cases.py

@@ -57,6 +57,7 @@ def example_weather_b():
         air_temperature=20,
         wind_direction=np.radians(80),  # Conductor azimuth is 0, so angle of attack is 80
         wind_speed=1.66,
+        ground_albedo=0.15,
         clearness_ratio=0.5,
     )
 
@@ -69,7 +70,6 @@ def example_span_b(drake_conductor_b):
         conductor=drake_conductor_b,
         start_tower=start_tower,
         end_tower=end_tower,
-        ground_albedo=0.15,
         num_conductors=1,
     )
 

tests/acceptance_tests/test_ieee_ampacity_cases.py

@@ -33,6 +33,7 @@ def example_weather_B():
         air_temperature=40,
         wind_direction=np.radians(90),
         wind_speed=0.61,
+        ground_albedo=0.5,
         clearness_ratio=1,
     )
 
@@ -45,7 +46,6 @@ def example_span_B(drake_conductor_B):
         conductor=drake_conductor_B,
         start_tower=start_tower,
         end_tower=end_tower,
-        ground_albedo=0.5,
         num_conductors=1,
     )
 
@@ -71,7 +71,6 @@ def example_span_C(drake_conductor_B):
         conductor=drake_conductor_B,
         start_tower=start_tower,
         end_tower=end_tower,
-        ground_albedo=0.5,
         num_conductors=2,
     )
 

tests/acceptance_tests/test_ratekit_ampacity_cases.py

@@ -35,6 +35,7 @@ def example_weather_a():
         air_temperature=np.array(30),
         wind_direction=np.radians(0),
         wind_speed=0.60,
+        ground_albedo=0.0,
         clearness_ratio=1,
     )
 
@@ -47,7 +48,6 @@ def example_span_a(parrot_conductor):
         conductor=parrot_conductor,
         start_tower=start_tower,
         end_tower=end_tower,
-        ground_albedo=0.0,
         num_conductors=1,
     )
 

tests/acceptance_tests/test_thermal_model.py

@@ -0,0 +1,53 @@
+"""Test cases from Annex E of CIGRE TB 601."""
+
+import numpy as np
+import pytest
+
+import linerate
+
+
+@pytest.fixture
+def drake_conductor_a():
+    return linerate.Conductor(
+        core_diameter=10.4e-3,
+        conductor_diameter=28.1e-3,
+        outer_layer_strand_diameter=4.4e-3,
+        emissivity=0.8,
+        solar_absorptivity=0.8,
+        temperature1=25,
+        temperature2=75,
+        resistance_at_temperature2=8.688e-5,
+        resistance_at_temperature1=7.283e-5,
+        aluminium_cross_section_area=float("nan"),
+        constant_magnetic_effect=1,
+        current_density_proportional_magnetic_effect=0,
+        max_magnetic_core_relative_resistance_increase=1,
+    )
+
+
+@pytest.fixture
+def example_weather_a():
+    return linerate.Weather(
+        air_temperature=40,
+        wind_direction=np.radians(30),  # Conductor azimuth is 90, so 90 - 30 is 30
+        wind_speed=0.61,
+        ground_albedo=0.1,
+        clearness_ratio=1,
+    )
+
+
+@pytest.fixture
+def example_span_a(drake_conductor_a):
+    start_tower = linerate.Tower(latitude=30, longitude=0.0001, altitude=0)
+    end_tower = linerate.Tower(latitude=30, longitude=-0.0001, altitude=0)
+    return linerate.Span(
+        conductor=drake_conductor_a,
+        start_tower=start_tower,
+        end_tower=end_tower,
+        num_conductors=1,
+    )
+
+
+@pytest.fixture
+def example_model_a(example_span_a, example_weather_a):
+    return linerate.Cigre601(example_span_a, example_weather_a, np.datetime64("2016-06-10 11:00"))

tests/conftest.py

@@ -45,6 +45,7 @@ def example_weather_a():
         air_temperature=40,
         wind_direction=np.radians(30),  # Conductor azimuth is 90, so 90 - 30 is 30
         wind_speed=0.61,
+        ground_albedo=0.1,
         clearness_ratio=1,
     )
 
@@ -57,7 +58,6 @@ def example_span_1_conductor(drake_conductor_a):
         conductor=drake_conductor_a,
         start_tower=start_tower,
         end_tower=end_tower,
-        ground_albedo=0.1,
         num_conductors=1,
     )
 
@@ -70,7 +70,6 @@ def example_span_2_conductors(drake_conductor_a):
         conductor=drake_conductor_a,
         start_tower=start_tower,
         end_tower=end_tower,
-        ground_albedo=0.1,
         num_conductors=2,
     )
 

tests/integration_tests/test_vectorization.py

@@ -34,6 +34,7 @@ def get_zeros(index, length):
         air_temperature=get_zeros(13, 25),
         wind_direction=get_zeros(14, 25),
         wind_speed=get_zeros(15, 25),
+        ground_albedo=get_zeros(23, 25),
         clearness_ratio=get_zeros(16, 25),
     )
     span = linerate.Span(
@@ -48,7 +49,6 @@ def get_zeros(index, length):
             0.1 + get_zeros(21, 25),
             10 + get_zeros(22, 25),
         ),
-        ground_albedo=get_zeros(23, 25),
         num_conductors=1,
     )
     time = np.array([np.datetime64("2022-01-01")]).reshape([1] * 25)