review

Author: cwhanse

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

@@ -9,7 +9,7 @@ Breaking changes
 
 Deprecations
 ~~~~~~~~~~~~
-* :py:func:`pvlib.irradiance.liujordan` is deprecated.
+* ``pvlib.irradiance.liujordan`` is deprecated.
 
 Enhancements
 ~~~~~~~~~~~~
@@ -21,9 +21,9 @@ Enhancements
   multiple MPPTs (:issue:`457`, :pull:`1085`)
 * Added optional ``attributes`` parameter to :py:func:`pvlib.iotools.get_psm3`
   and added the option of fetching 5- and 15-minute PSM3 data. (:pull:`1086`)
-* Added :py:func:`pvlib.irradiance.campbellnorman` for estimating DNI, DHI and GHI
-  from extraterrestrial irradiance. This function replaces :py:func:`pvlib.irradiance.liujordan`;
-  users of :py:func:`pvlib.irradiance.liujordan` should note that :py:func:`pvlib.irradiance.campbellnorman`
+* Added :py:func:`pvlib.irradiance.campbell_norman` for estimating DNI, DHI and GHI
+  from extraterrestrial irradiance. This function replaces ``pvlib.irradiance.liujordan``;
+  users of ``pvlib.irradiance.liujordan`` should note that :py:func:`pvlib.irradiance.campbell_norman`
   expects different parameters.
 
 Bug fixes

pvlib/irradiance.py

@@ -2187,7 +2187,8 @@ def erbs(ghi, zenith, datetime_or_doy, min_cos_zenith=0.065, max_zenith=87):
     return data
 
 
-def campbellnorman(zenith, transmittance, pressure=101325.0, dni_extra=1367.0):
+def campbell_norman(zenith, transmittance, pressure=101325.0,
+                    dni_extra=1367.0):
     '''
     Determine DNI, DHI, GHI from extraterrestrial flux, transmittance,
     and atmospheric pressure.
@@ -2225,8 +2226,9 @@ def campbellnorman(zenith, transmittance, pressure=101325.0, dni_extra=1367.0):
     airmass = atmosphere.get_relative_airmass(zenith, model='simple')
     airmass = atmosphere.get_absolute_airmass(airmass, pressure=pressure)
     dni = dni_extra*tau**airmass
-    dhi = 0.3 * (1.0 - tau**airmass) * dni_extra * np.cos(np.radians(zenith))
-    ghi = dhi + dni * np.cos(np.radians(zenith))
+    cos_zen = tools.cosd(zenith)
+    dhi = 0.3 * (1.0 - tau**airmass) * dni_extra * cos_zen
+    ghi = dhi + dni * cos_zen
 
     irrads = OrderedDict()
     irrads['ghi'] = ghi

pvlib/tests/test_irradiance.py

@@ -286,22 +286,24 @@ def test_get_sky_diffuse_invalid():
             model='invalid')
 
 
+@fail_on_pvlib_version('0.9')
 def test_liujordan():
     expected = pd.DataFrame(np.array(
         [[863.859736967, 653.123094076, 220.65905025]]),
         columns=['ghi', 'dni', 'dhi'],
         index=[0])
-    out = irradiance.liujordan(
-        pd.Series([10]), pd.Series([0.5]), pd.Series([1.1]), dni_extra=1400)
+    with pytest.warns(pvlibDeprecationWarning):
+        out = irradiance.liujordan(
+            pd.Series([10]), pd.Series([0.5]), pd.Series([1.1]), dni_extra=1400)
     assert_frame_equal(out, expected)
 
 
-def test_campbellnorman():
+def test_campbell_norman():
     expected = pd.DataFrame(np.array(
         [[863.859736967, 653.123094076, 220.65905025]]),
         columns=['ghi', 'dni', 'dhi'],
         index=[0])
-    out = irradiance.campbellnorman(
+    out = irradiance.campbell_norman(
         pd.Series([10]), pd.Series([0.5]), pd.Series([109764.21013135818]),
         dni_extra=1400)
     assert_frame_equal(out, expected)
@@ -940,11 +942,3 @@ def test_clearness_index_zenith_independent(airmass_kt):
                                                         airmass)
     expected = pd.Series([np.nan, 0.553744437562], index=times)
     assert_series_equal(out, expected)
-
-
-@fail_on_pvlib_version('0.9')
-def test_deprecated_09():
-    # deprecated function irradiance.liujordan
-    with pytest.warns(pvlibDeprecationWarning):
-        irradiance.liujordan(
-        pd.Series([10]), pd.Series([0.5]), pd.Series([1.1]), dni_extra=1400)