Merge branch 'main' into add-bifacial-townsend-snow

Author: cwhanse

docs/sphinx/source/whatsnew/v0.15.2.rst

@@ -18,13 +18,21 @@ Bug fixes
   data type integer, users can expect modeled cell temperature values to
   increase slightly.
   (:issue:`2608`, :pull:`2745`)
+* Fixes a regression in :py:func:`pvlib.tracking.calc_surface_orientation`
+  introduced in v0.15.1 (:pull:`2702`) that caused a broadcasting
+  ``ValueError`` when ``tracker_theta`` was a 2-D (or higher rank) array.
+  (:issue:`2747`, :pull:`2749`)
 
 Enhancements
 ~~~~~~~~~~~~
 * Add the ``front_side_fraction`` parameter to
   :py:func:`pvlib.snow.loss_townsend` to support Townsend snow-loss
   workflows for bifacial systems. (:issue:`2755`, :pull:`2756`)
 
+* Added mapping of the parameter ``"albedo"`` in
+  :py:func:`~pvlib.iotools.get_nasa_power` when ``map_variables=True``
+  (:pull:`2753`)
+
 
 Documentation
 ~~~~~~~~~~~~~
@@ -57,3 +65,5 @@ Contributors
 * :ghuser:`Omesh37`
 * Cliff Hansen (:ghuser:`cwhanse`)
 * :ghuser:`shethkajal7`
+* Arthur Onno (:ghuser:`ArthurOnnoTerabase`)
+* Adam R. Jensen (:ghuser:`AdamRJensen`)

pvlib/iotools/nasa_power.py

@@ -18,6 +18,7 @@
     'T2M': 'temp_air',
     'WS2M': 'wind_speed_2m',
     'WS10M': 'wind_speed',
+    'ALLSKY_SRF_ALB': 'albedo',
 }
 
 

pvlib/tracking.py

@@ -233,10 +233,11 @@ def _unit_normal(axis_azimuth, axis_tilt, theta):
     Returns
     -------
     ndarray
-        Shape (N,3) where theta has length N
+        Shape ``theta.shape + (3,)``, with a minimum rank of 2.  For 1-D
+        ``theta`` of length N this is ``(N, 3)``.
     """
 
-    theta = np.asarray(theta)
+    theta = np.atleast_1d(np.asarray(theta))
 
     cA, sA = cosd(-axis_azimuth), sind(-axis_azimuth)
     cT, sT = cosd(-axis_tilt), sind(-axis_tilt)
@@ -248,7 +249,7 @@ def _unit_normal(axis_azimuth, axis_tilt, theta):
     y = sA * sTh - cA * sT * cTh
     z = cT * cTh
 
-    result = np.column_stack((x, y, z))
+    result = np.stack((x, y, z), axis=-1)
 
     return result
 
@@ -296,7 +297,7 @@ def calc_surface_orientation(tracker_theta, axis_tilt=0, axis_azimuth=0):
 
     # project unit_normal to x-y plane to calculate azimuth
     surface_azimuth = np.degrees(
-        np.arctan2(unit_normal[:, 0], unit_normal[:, 1]))
+        np.arctan2(unit_normal[..., 0], unit_normal[..., 1]))
 
     surface_azimuth = np.where(surface_tilt == 0., axis_azimuth - 90.,
                                surface_azimuth)

tests/iotools/test_meteonorm.py

@@ -34,11 +34,11 @@ def expected_meta():
             'description': 'Global horizontal irradiance',
             'name': 'global_horizontal_irradiance',
             'unit': {
-                'description': 'Watt per square meter', 'name': 'W/m**2'}},
+                'description': 'watt per square meter', 'name': 'W/m**2'}},
            {'aggregation_method': 'average',
             'description': 'Global horizontal irradiance with shading taken into account',  # noqa: E501
             'name': 'global_horizontal_irradiance_with_shading',
-            'unit': {'description': 'Watt per square meter',
+            'unit': {'description': 'watt per square meter',
                      'name': 'W/m**2'}},
         ],
         'surface_azimuth': 180,
@@ -245,7 +245,7 @@ def expected_meteonorm_tmy_meta():
             'aggregation_method': 'average',
             'description': 'Diffuse horizontal irradiance',
             'name': 'diffuse_horizontal_irradiance',
-            'unit': {'description': 'Watt per square meter',
+            'unit': {'description': 'watt per square meter',
                      'name': 'W/m**2'},
         }],
         'surface_azimuth': 90,

tests/test_tracking.py

@@ -557,3 +557,31 @@ def test_calc_surface_orientation_special():
         # in a modulo-360 sense.
         np.testing.assert_allclose(np.round(out['surface_azimuth'], 4) % 360,
                                    expected_azimuths, rtol=1e-5, atol=1e-5)
+
+
+@pytest.mark.parametrize('shape', [(3, 5), (1, 7), (4, 1), (2, 3, 4)])
+def test_calc_surface_orientation_2d(shape):
+    # Regression test for GH#2747: calc_surface_orientation must accept
+    # tracker_theta of arbitrary rank, not just 1-D.  Compare the >1-D result
+    # to the 1-D result computed on the flattened input.
+    rotations_flat = np.linspace(-90, 90, int(np.prod(shape)))
+    rotations_nd = rotations_flat.reshape(shape)
+
+    out_1d = tracking.calc_surface_orientation(rotations_flat,
+                                               axis_tilt=20,
+                                               axis_azimuth=180)
+    out_nd = tracking.calc_surface_orientation(rotations_nd,
+                                               axis_tilt=20,
+                                               axis_azimuth=180)
+
+    assert out_nd['surface_tilt'].shape == shape
+    assert out_nd['surface_azimuth'].shape == shape
+    np.testing.assert_allclose(out_nd['surface_tilt'].reshape(-1),
+                               out_1d['surface_tilt'])
+    np.testing.assert_allclose(out_nd['surface_azimuth'].reshape(-1),
+                               out_1d['surface_azimuth'])
+
+    # _unit_normal must preserve the input rank, appending a trailing axis
+    # of length 3.
+    unorm = tracking._unit_normal(180., 20., rotations_nd)
+    assert unorm.shape == shape + (3,)