Merge branch 'main' into joss-paper

Author: kandersolar

benchmarks/benchmarks/location.py

@@ -4,7 +4,7 @@
 
 import pandas as pd
 import pvlib
-from pkg_resources import parse_version
+from packaging.version import Version
 
 
 def set_solar_position(obj):
@@ -37,7 +37,7 @@ def time_location_get_clearsky(self):
 class Location_0_6_1:
 
     def setup(self):
-        if parse_version(pvlib.__version__) < parse_version('0.6.1'):
+        if Version(pvlib.__version__) < Version('0.6.1'):
             raise NotImplementedError
 
         set_solar_position(self)

benchmarks/benchmarks/solarposition.py

@@ -7,10 +7,10 @@
 import pvlib
 from pvlib import solarposition
 
-from pkg_resources import parse_version
+from packaging.version import Version
 
 
-if parse_version(pvlib.__version__) >= parse_version('0.6.1'):
+if Version(pvlib.__version__) >= Version('0.6.1'):
     sun_rise_set_transit_spa = solarposition.sun_rise_set_transit_spa
 else:
     sun_rise_set_transit_spa = solarposition.get_sun_rise_set_transit

benchmarks/benchmarks/solarposition_numba.py

@@ -7,7 +7,7 @@
 Try to keep relevant sections in sync with benchmarks/solarposition.py
 """
 
-from pkg_resources import parse_version
+from packaging.version import Version
 import pandas as pd
 
 import os
@@ -18,7 +18,7 @@
 from pvlib import solarposition  # NOQA: E402
 
 
-if parse_version(pvlib.__version__) >= parse_version('0.6.1'):
+if Version(pvlib.__version__) >= Version('0.6.1'):
     sun_rise_set_transit_spa = solarposition.sun_rise_set_transit_spa
 else:
     sun_rise_set_transit_spa = solarposition.get_sun_rise_set_transit

benchmarks/benchmarks/temperature.py

@@ -4,7 +4,7 @@
 
 import pandas as pd
 import pvlib
-from pkg_resources import parse_version
+from packaging.version import Version
 from functools import partial
 
 
@@ -20,7 +20,7 @@ class SAPM:
 
     def setup(self):
         set_weather_data(self)
-        if parse_version(pvlib.__version__) >= parse_version('0.7.0'):
+        if Version(pvlib.__version__) >= Version('0.7.0'):
             kwargs = pvlib.temperature.TEMPERATURE_MODEL_PARAMETERS['sapm']
             kwargs = kwargs['open_rack_glass_glass']
             self.sapm_cell_wrapper = partial(pvlib.temperature.sapm_cell,
@@ -41,7 +41,7 @@ def time_sapm_cell(self):
 class Fuentes:
 
     def setup(self):
-        if parse_version(pvlib.__version__) < parse_version('0.8.0'):
+        if Version(pvlib.__version__) < Version('0.8.0'):
             raise NotImplementedError
 
         set_weather_data(self)

docs/examples/irradiance-decomposition/plot_diffuse_fraction.py

@@ -203,7 +203,7 @@
 # `NSRDB`_ user manuals.
 #
 # The Erbs and Boland models are correlations only based on the clearness index
-# kt, which is the ratio of GHI to the the horizontal component of the
+# kt, which is the ratio of GHI to the horizontal component of the
 # extra-terrestrial irradiance. At low sun elevation (zenith near 90 degrees),
 # especially near sunset, kt can explode because the denominator
 # (extra-terrestrial irradiance) approaches zero. In pvlib this behavior is

docs/examples/iv-modeling/plot_singlediode.py

@@ -118,7 +118,6 @@
 plt.xlabel('Module voltage [V]')
 plt.ylabel('Module current [A]')
 plt.title(parameters['Name'])
-plt.show()
 plt.gcf().set_tight_layout(True)
 
 
@@ -136,6 +135,7 @@ def draw_arrow(ax, label, x0, y0, rotation, size, direction):
 ax = plt.gca()
 draw_arrow(ax, 'Irradiance', 20, 2.5, 90, 15, 'r')
 draw_arrow(ax, 'Temperature', 35, 1, 0, 15, 'l')
+plt.show()
 
 print(pd.DataFrame({
     'i_sc': curve_info['i_sc'],

docs/sphinx/source/reference/irradiance/transposition.rst

@@ -10,6 +10,7 @@ Transposition models
    irradiance.get_sky_diffuse
    irradiance.isotropic
    irradiance.perez
+   irradiance.perez_driesse
    irradiance.haydavies
    irradiance.klucher
    irradiance.reindl

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

@@ -7,20 +7,29 @@ v0.10.3 (Anticipated December, 2023)
 
 Enhancements
 ~~~~~~~~~~~~
-
+* Added the continuous Perez-Driesse transposition model.
+  :py:func:`pvlib.irradiance.perez_driesse` (:issue:`1841`, :pull:`1876`)
+* :py:func:`pvlib.bifacial.infinite_sheds.get_irradiance` and
+  :py:func:`pvlib.bifacial.infinite_sheds.get_irradiance_poa` now include
+  shaded fraction in returned variables. (:pull:`1871`)
 
 Bug fixes
 ~~~~~~~~~
 
 
 Testing
 ~~~~~~~
+* Replace use of deprecated ``pkg_resources``. (:issue:`1881`, :pull:`1882`)
 
 
 Documentation
 ~~~~~~~~~~~~~
-
+* Fixed a plotting issue in the IV curve gallery example (:pull:`1895`)
 
 Contributors
 ~~~~~~~~~~~~
-
+* Arjan Keeman (:ghuser:`akeeman`)
+* Miguel Sánchez de León Peque (:ghuser:`Peque`)
+* Will Hobbs (:ghuser:`williamhobbs`)
+* Anton Driesse (:ghuser:`adriesse`)
+* :ghuser:`matsuobasho`

pvlib/bifacial/infinite_sheds.py

@@ -276,6 +276,8 @@ def get_irradiance_poa(surface_tilt, surface_azimuth, solar_zenith,
       [W/m^2]
     - ``poa_ground_diffuse`` : total ground-reflected diffuse irradiance on the
       plane of array. [W/m^2]
+    - ``shaded_fraction`` : fraction of row slant height from the bottom that
+      is shaded from direct irradiance by adjacent rows. [unitless]
 
     References
     ----------
@@ -369,7 +371,7 @@ def get_irradiance_poa(surface_tilt, surface_azimuth, solar_zenith,
     output = {
         'poa_global': poa_global, 'poa_direct': poa_direct,
         'poa_diffuse': poa_diffuse, 'poa_ground_diffuse': poa_gnd_pv,
-        'poa_sky_diffuse': poa_sky_pv}
+        'poa_sky_diffuse': poa_sky_pv, 'shaded_fraction': f_x}
     if isinstance(poa_global, pd.Series):
         output = pd.DataFrame(output)
     return output
@@ -502,6 +504,9 @@ def get_irradiance(surface_tilt, surface_azimuth, solar_zenith, solar_azimuth,
       cells from the front surface. [W/m^2]
     - ``poa_front_ground_diffuse`` : ground-reflected diffuse irradiance
       reaching the module cells from the front surface. [W/m^2]
+    - ``shaded_fraction_front`` : fraction of row slant height from the bottom
+      that is shaded from direct irradiance on the front surface by adjacent
+      rows. [unitless]
     - ``poa_back_direct`` : direct irradiance reaching the module cells from
       the back surface. [W/m^2]
     - ``poa_back_diffuse`` : total diffuse irradiance reaching the module
@@ -510,6 +515,9 @@ def get_irradiance(surface_tilt, surface_azimuth, solar_zenith, solar_azimuth,
       cells from the back surface. [W/m^2]
     - ``poa_back_ground_diffuse`` : ground-reflected diffuse irradiance
       reaching the module cells from the back surface. [W/m^2]
+    - ``shaded_fraction_back`` : fraction of row slant height from the bottom
+      that is shaded from direct irradiance on the back surface by adjacent
+      rows. [unitless]
 
     References
     ----------
@@ -545,13 +553,15 @@ def get_irradiance(surface_tilt, surface_azimuth, solar_zenith, solar_azimuth,
         'poa_diffuse': 'poa_front_diffuse',
         'poa_sky_diffuse': 'poa_front_sky_diffuse',
         'poa_ground_diffuse': 'poa_front_ground_diffuse',
+        'shaded_fraction': 'shaded_fraction_front',
     }
     colmap_back = {
         'poa_global': 'poa_back',
         'poa_direct': 'poa_back_direct',
         'poa_diffuse': 'poa_back_diffuse',
         'poa_sky_diffuse': 'poa_back_sky_diffuse',
         'poa_ground_diffuse': 'poa_back_ground_diffuse',
+        'shaded_fraction': 'shaded_fraction_back',
     }
 
     if isinstance(ghi, pd.Series):

pvlib/iam.py

@@ -840,7 +840,7 @@ def schlick(aoi):
 
 
 def schlick_diffuse(surface_tilt):
-    """
+    r"""
     Determine the incidence angle modifiers (IAM) for diffuse sky and
     ground-reflected irradiance on a tilted surface using the Schlick
     incident angle model.