improvements from review

pvlib · kandersolar · Aug 19, 2022 · Jun 9, 2022 · Jun 10, 2022 · Jun 13, 2022
commit 0a10e56772eeb25b57631a7fda826e7ff5a5209e
diff --git a/pvlib/pvsystem.py b/pvlib/pvsystem.py
@@ -336,7 +336,7 @@ def get_aoi(self, solar_zenith, solar_azimuth):
 
     @_unwrap_single_value
     def get_irradiance(self, solar_zenith, solar_azimuth, dni, ghi, dhi,
-                       dni_extra=None, airmass=None,
+                       albedo=None, dni_extra=None, airmass=None,
                        model='haydavies', **kwargs):
         """
         Uses the :py:func:`irradiance.get_total_irradiance` function to
@@ -345,18 +345,21 @@ def get_irradiance(self, solar_zenith, solar_azimuth, dni, ghi, dhi,
 
         Parameters
         ----------
-        solar_zenith : float or Series.
+        solar_zenith : float or Series
             Solar zenith angle.
-        solar_azimuth : float or Series.
+        solar_azimuth : float or Series
             Solar azimuth angle.
         dni : float or Series or tuple of float or Series
             Direct Normal Irradiance. [W/m2]
         ghi : float or Series or tuple of float or Series
             Global horizontal irradiance. [W/m2]
         dhi : float or Series or tuple of float or Series
             Diffuse horizontal irradiance. [W/m2]
-        dni_extra : None, float or Series, default None
-            Extraterrestrial direct normal irradiance [W/m2]
+        albedo : None, float or Series, default None
+            Ground surface albedo. [unitless]
+        dni_extra : None, float, Series or tuple of float or Series,
+            default None
+            Extraterrestrial direct normal irradiance. [W/m2]
         airmass : None, float or Series, default None
             Airmass. [unitless]
         model : String, default 'haydavies'
@@ -387,17 +390,14 @@ def get_irradiance(self, solar_zenith, solar_azimuth, dni, ghi, dhi,
         ghi = self._validate_per_array(ghi, system_wide=True)
         dhi = self._validate_per_array(dhi, system_wide=True)
 
-        try:
-            albedo = kwargs.pop('albedo')
-        except KeyError:
-            albedo = None
         albedo = self._validate_per_array(albedo, system_wide=True)
 
         return tuple(
             array.get_irradiance(solar_zenith, solar_azimuth,
                                  dni, ghi, dhi,
-                                 albedo,
-                                 dni_extra, airmass, model,
+                                 albedo=albedo,
+                                 dni_extra=dni_extra, airmass=airmass,
+                                 model=model,
                                  **kwargs)
             for array, dni, ghi, dhi, albedo in zip(
                 self.arrays, dni, ghi, dhi, albedo

diff --git a/pvlib/tests/test_modelchain.py b/pvlib/tests/test_modelchain.py
@@ -503,7 +503,6 @@ def test_prepare_inputs_albedo_in_weather(
     times = pd.date_range(start='20160101 1200-0700',
                           end='20160101 1800-0700', freq='6H')
     mc = ModelChain(sapm_dc_snl_ac_system_Array, location)
-    # albedo on pvsystem but not in weather
     weather = pd.DataFrame({'ghi': 1, 'dhi': 1, 'dni': 1, 'albedo': 0.5},
                            index=times)
     # weather as a single DataFrame

diff --git a/pvlib/tracking.py b/pvlib/tracking.py
@@ -248,12 +248,9 @@ def get_irradiance(self, surface_tilt, surface_azimuth,
         dhi = self._validate_per_array(dhi, system_wide=True)
 
         if albedo is None:
-            try:
-                albedo = kwargs.pop('albedo')
-            except KeyError:
-                # assign default albedo here because SingleAxisTracker
-                # initializes albedo to None
-                albedo = 0.25
+            # assign default albedo here because SingleAxisTracker
+            # initializes albedo to None
+            albedo = 0.25
 
         albedo = self._validate_per_array(albedo, system_wide=True)