Merge pull request #145 from mayudong/master

Issue#144-fixed the azimuth calculation of rotated PV panel

Author: wholmgren

docs/sphinx/source/whatsnew/v0.3.1.txt

@@ -22,8 +22,11 @@ Bug fixes
   sense PV array voltage. The model was erroneously comparing Ps0 with
   the AC output power (ac_power), rather than the DC input power (p_dc).
 
-
+* Fixed the azimuth calculation of rotated PV panel in function
+  pvlib.tracking.singleaxis(...) so that the results are consistent
+  with PVsyst
 Contributors
 ~~~~~~~~~~~~
 
 * ejmiller2
+* Yudong Ma

pvlib/test/test_tracking.py

@@ -107,7 +107,7 @@ def test_axis_tilt():
                                        max_angle=90, backtrack=True, 
                                        gcr=2.0/7.0)
 
-    expect = pd.DataFrame({'aoi': 7.286245, 'surface_azimuth': 37.3427,
+    expect = pd.DataFrame({'aoi': 7.286245, 'surface_azimuth': 142.65730,
                            'surface_tilt': 35.98741, 'tracker_theta': -20.88121},
                            index=[0], dtype=np.float64)
 
@@ -118,7 +118,7 @@ def test_axis_tilt():
                                        max_angle=90, backtrack=True, 
                                        gcr=2.0/7.0)
 
-    expect = pd.DataFrame({'aoi': 47.6632, 'surface_azimuth': 129.0303,
+    expect = pd.DataFrame({'aoi': 47.6632, 'surface_azimuth': 50.96969,
                            'surface_tilt': 42.5152, 'tracker_theta': 31.6655},
                            index=[0], dtype=np.float64)
 
@@ -188,12 +188,32 @@ def test_SingleAxisTracker_tracking():
 
     tracker_data = system.singleaxis(apparent_zenith, apparent_azimuth)
 
-    expect = pd.DataFrame({'aoi': 7.286245, 'surface_azimuth': 37.3427,
+    expect = pd.DataFrame({'aoi': 7.286245, 'surface_azimuth': 142.65730 ,
                            'surface_tilt': 35.98741, 'tracker_theta': -20.88121},
                            index=[0], dtype=np.float64)
 
     assert_frame_equal(expect, tracker_data)
 
+    ### results calculated using PVsyst
+    pvsyst_solar_azimuth = 7.1609
+    pvsyst_solar_height = 27.315
+    pvsyst_axis_tilt = 20.
+    pvsyst_axis_azimuth = 20.
+    pvsyst_system = tracking.SingleAxisTracker(max_angle=60.,
+                                               axis_tilt=pvsyst_axis_tilt,
+                                               axis_azimuth=180+pvsyst_axis_azimuth,
+                                               backtrack=False)
+    # the definition of azimuth is different from PYsyst
+    apparent_azimuth = pd.Series([180+pvsyst_solar_azimuth])
+    apparent_zenith = pd.Series([90-pvsyst_solar_height])
+    tracker_data = pvsyst_system.singleaxis(apparent_zenith, apparent_azimuth)
+    expect = pd.DataFrame({'aoi': 41.07852 , 'surface_azimuth': 180-18.432 ,
+                           'surface_tilt': 24.92122 , 'tracker_theta': -15.18391},
+                           index=[0], dtype=np.float64)
+
+    assert_frame_equal(expect, tracker_data)
+
+
 
 def test_LocalizedSingleAxisTracker_creation():
     localized_system = tracking.LocalizedSingleAxisTracker(latitude=32,
@@ -254,7 +274,7 @@ def test_get_irradiance():
                                        surface_azimuth=tracker_data['surface_azimuth'])
 
     expected = pd.DataFrame(data=np.array(
-        [[ 142.71652464,   87.50125991,   55.21526473,   44.68768982,
+        [[ 961.80070,   815.94490,   145.85580,   135.32820,
           10.52757492],
        [          nan,           nan,           nan,           nan,
                   nan]]),

pvlib/tracking.py

@@ -485,7 +485,7 @@ def singleaxis(apparent_zenith, apparent_azimuth,
 
     # 4. Rotate 0 reference from panel's x axis to it's y axis and
     #    then back to North.
-    surface_azimuth += 90 + axis_azimuth
+    surface_azimuth = 90-surface_azimuth + axis_azimuth
 
     # 5. Map azimuth into [0,360) domain.
     surface_azimuth[surface_azimuth<0] += 360