Merge branch 'main' into doc-hsu-depo-veloc-note

Author: kandersolar

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

@@ -78,6 +78,10 @@ Documentation
 * Clarify in the ``Notes`` section of :py:func:`pvlib.soiling.hsu` that the
   default ``depo_veloc`` values correspond to the settling velocity of
   particulates. (:issue:`2535`)
+* Correct the transposed table of Hellmann exponents in the
+  :py:func:`pvlib.atmosphere.windspeed_powerlaw` docstring, which disagreed
+  with :py:data:`pvlib.atmosphere.HELLMANN_SURFACE_EXPONENTS` in four of its
+  nine cells. (:pull:`2853`)
 
 
 Testing
@@ -104,3 +108,4 @@ Contributors
 * Sai Asish Y (:ghuser:`SAY-5`)
 * Kevin Anderson (:ghuser:`kandersolar`)
 * Johann Loux (:ghuser:`JoLo90`)
+* Dylan Pulver (:ghuser:`dylanpulver`)

pvlib/atmosphere.py

@@ -664,7 +664,7 @@ def windspeed_powerlaw(wind_speed_reference, height_reference,
         Exponent based on the surface type. [unitless]
 
     surface_type : string, optional
-        If supplied, overrides ``exponent``. Can be one of the following
+        Mutually exclusive with ``exponent``. Can be one of the following
         (see [1]_):
 
         * ``'unstable_air_above_open_water_surface'``
@@ -723,16 +723,16 @@ def windspeed_powerlaw(wind_speed_reference, height_reference,
     :math:`a` [unitless] depends on the surface type. Some values found in the
     literature [1]_ for :math:`a` are:
 
-    .. table:: Values for the Hellmann-exponent
+    .. table:: Values for the Hellmann-exponent ([1_], Table 2.3).
 
        +-----------+--------------------+------------------+------------------+
        | Stability | Open water surface | Flat, open coast | Cities, villages |
        +===========+====================+==================+==================+
-       | Unstable  | 0.06               | 0.10             | 0.27             |
+       | Unstable  | 0.06               | 0.11             | 0.27             |
        +-----------+--------------------+------------------+------------------+
-       | Neutral   | 0.11               | 0.16             | 0.40             |
+       | Neutral   | 0.10               | 0.16             | 0.34             |
        +-----------+--------------------+------------------+------------------+
-       | Stable    | 0.27               | 0.34             | 0.60             |
+       | Stable    | 0.27               | 0.40             | 0.60             |
        +-----------+--------------------+------------------+------------------+
 
     In a report by Sandia [3]_, the equation was experimentally tested for a