update test_irradiance

Author: wholmgren

pvlib/irradiance.py

@@ -11,6 +11,7 @@
 pvl_logger = logging.getLogger('pvlib')
 
 import datetime
+from collections import OrderedDict
 
 import numpy as np
 import pandas as pd
@@ -2043,6 +2044,12 @@ def liujordan(zenith, transmittance, airmass, pressure=101325.,
     dhi = 0.3 * (1.0 - tao**airmass) * dni_extra * np.cos(np.radians(zenith))
     ghi = dhi + dni * np.cos(np.radians(zenith))
 
-    irrads = pd.DataFrame({'ghi': ghi, 'dni': dni, 'dhi': dhi})
+    irrads = OrderedDict()
+    irrads['ghi'] = ghi
+    irrads['dni'] = dni
+    irrads['dhi'] = dhi
+
+    if isinstance(ghi, pd.Series):
+        irrads = pd.DataFrame(irrads)
 
     return irrads

pvlib/test/test_irradiance.py

@@ -142,8 +142,14 @@ def test_perez():
 
 
 def test_liujordan():
-    cloud_prct = np.array([40]*len(ephem_data['apparent_zenith']))
-    irradiance.liujordan(ephem_data['apparent_zenith'], cloud_prct)
+    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]),
+        pressure=93000., dni_extra=1400)
+    assert_frame_equal(out, expected)
 
 
 # klutcher (misspelling) will be removed in 0.3