Merge branch 'master' into master

Author: cwhanse

pvlib/data/sam-library-cec-inverters-2018-3-18.csv

@@ -2505,6 +2505,7 @@ LeadSolar Energy: LS600 [240V] 240V [CEC 2018],240,500,524.883,36,1.95681,-3.049
 LeadSolar Energy: LS600ES 277V [CEC 2014],277,600,624.32414,27.03322619,2.57570801,-1.13E-05,-1.34E-04,6.35E-02,0.119358397,0.04,60,19.4,27,45
 LeadSolar Energy: LS600ES [277V] 277V [CEC 2018],277,600,624.486,54,2.56291,-1.15006e-005,2.48251e-005,0.0534707,0.122932,0.04,56,11.5646,52,56
 LeadSolar Energy: LS600T (208V) 208V [CEC 2014],208,500,527.5554744,35.98932976,2.868916375,-4.73E-05,-1.02E-03,1.57E-02,-5.39E-02,1,60,19.4,27,45
+LeadSolar Energy: LS600T [208V] 208V [CEC 2018],208,500,75790.4,36,-nan(ind),1.22899e-07,-0.0251886,-nan(ind),0.0798754,1,45,2105.29,27,45
 LeadSolar Energy: LS650S 277V [CEC 2014],277,650,676.7493403,54.0729254,2.38789227,-9.80E-06,-2.17E-04,5.41E-02,6.69E-02,0.04,60,19.4,52,56
 LeadSolar Energy: LS650S [277V] 277V [CEC 2018],277,650,676.704,54,2.30605,-8.83925e-006,-0.000202645,0.04063,0.0452291,0.04,56,12.5316,52,56
 LeadSolar Energy: LS700S 277V [CEC 2014],277,700,729.7125005,54.07850476,2.024489833,-7.75E-06,-3.55E-04,7.09E-02,0.101741464,0.04,60,19.4,52,56

pvlib/irradiance.py

@@ -6,6 +6,8 @@
 
 from __future__ import division
 
+import logging
+
 import datetime
 from collections import OrderedDict
 from functools import partial
@@ -17,7 +19,8 @@
 from pvlib import solarposition
 from pvlib import atmosphere
 
-# see References section of grounddiffuse function
+pvl_logger = logging.getLogger('pvlib')
+
 SURFACE_ALBEDOS = {'urban': 0.18,
                    'grass': 0.20,
                    'fresh grass': 0.26,
@@ -30,8 +33,7 @@
                    'aluminum': 0.85,
                    'copper': 0.74,
                    'fresh steel': 0.35,
-                   'dirty steel': 0.08,
-                   'sea': 0.06}
+                   'dirty steel': 0.08}
 
 
 def extraradiation(datetime_or_doy, solar_constant=1366.1, method='spencer',
@@ -343,6 +345,8 @@ def total_irrad(surface_tilt, surface_azimuth,
         'poa_sky_diffuse', 'poa_ground_diffuse'``.
     """
 
+    pvl_logger.debug('planeofarray.total_irrad()')
+
     solar_zenith = apparent_zenith
     solar_azimuth = azimuth
 
@@ -471,8 +475,8 @@ def grounddiffuse(surface_tilt, ghi, albedo=.25, surface_type=None):
 
     surface_type: None or string, default None
         If not None, overrides albedo. String can be one of ``'urban',
-        'grass', 'fresh grass', 'snow', 'fresh snow', 'asphalt', 'concrete',
-         'aluminum', 'copper', 'fresh steel', 'dirty steel', 'sea'``.
+        'grass', 'fresh grass', 'snow', 'fresh snow', 'asphalt',
+        'concrete', 'aluminum', 'copper', 'fresh steel', 'dirty steel'``.
 
     Returns
     -------
@@ -489,15 +493,17 @@ def grounddiffuse(surface_tilt, ghi, albedo=.25, surface_type=None):
     The calculation is the last term of equations 3, 4, 7, 8, 10, 11, and 12.
 
     [2] albedos from:
-    http://files.pvsyst.com/help/albedo.htm
+    http://pvpmc.org/modeling-steps/incident-irradiance/plane-of-array-poa-irradiance/calculating-poa-irradiance/poa-ground-reflected/albedo/
     and
     http://en.wikipedia.org/wiki/Albedo
-    and
-    https://doi.org/10.1175/1520-0469(1972)029<0959:AOTSS>2.0.CO;2
     '''
 
+    pvl_logger.debug('diffuse_ground.get_diffuse_ground()')
+
     if surface_type is not None:
         albedo = SURFACE_ALBEDOS[surface_type]
+        pvl_logger.info('surface_type=%s mapped to albedo=%s',
+                        surface_type, albedo)
 
     diffuse_irrad = ghi * albedo * (1 - np.cos(np.radians(surface_tilt))) * 0.5
 
@@ -549,6 +555,8 @@ def isotropic(surface_tilt, dhi):
     heat collector. Trans. ASME 64, 91.
     '''
 
+    pvl_logger.debug('diffuse_sky.isotropic()')
+
     sky_diffuse = dhi * (1 + tools.cosd(surface_tilt)) * 0.5
 
     return sky_diffuse
@@ -620,6 +628,8 @@ def klucher(surface_tilt, surface_azimuth, dhi, ghi, solar_zenith,
     tilted surfaces. Solar Energy 23 (2), 111-114.
     '''
 
+    pvl_logger.debug('diffuse_sky.klucher()')
+
     # zenith angle with respect to panel normal.
     cos_tt = aoi_projection(surface_tilt, surface_azimuth,
                             solar_zenith, solar_azimuth)
@@ -709,6 +719,8 @@ def haydavies(surface_tilt, surface_azimuth, dhi, dni, dni_extra,
     Ministry of Supply and Services, Canada.
     '''
 
+    pvl_logger.debug('diffuse_sky.haydavies()')
+
     # if necessary, calculate ratio of titled and horizontal beam irradiance
     if projection_ratio is None:
         cos_tt = aoi_projection(surface_tilt, surface_azimuth,
@@ -807,6 +819,8 @@ def reindl(surface_tilt, surface_azimuth, dhi, dni, ghi, dni_extra,
     hourly tilted surface radiation models. Solar Energy 45(1), 9-17.
     '''
 
+    pvl_logger.debug('diffuse_sky.reindl()')
+
     cos_tt = aoi_projection(surface_tilt, surface_azimuth,
                             solar_zenith, solar_azimuth)
 
@@ -867,6 +881,8 @@ def king(surface_tilt, dhi, ghi, solar_zenith):
         The diffuse component of the solar radiation.
     '''
 
+    pvl_logger.debug('diffuse_sky.king()')
+
     sky_diffuse = (dhi * ((1 + tools.cosd(surface_tilt))) / 2 + ghi *
                    ((0.012 * solar_zenith - 0.04)) *
                    ((1 - tools.cosd(surface_tilt))) / 2)
@@ -979,8 +995,7 @@ def perez(surface_tilt, surface_azimuth, dhi, dni, dni_extra,
     delta = dhi * airmass / dni_extra
 
     # epsilon is the sky's "clearness"
-    with np.errstate(invalid='ignore'):
-        eps = ((dhi + dni) / dhi + kappa * (z ** 3)) / (1 + kappa * (z ** 3))
+    eps = ((dhi + dni) / dhi + kappa * (z ** 3)) / (1 + kappa * (z ** 3))
 
     # numpy indexing below will not work with a Series
     if isinstance(eps, pd.Series):
@@ -990,8 +1005,15 @@ def perez(surface_tilt, surface_azimuth, dhi, dni, dni_extra,
     # rules. 1 = overcast ... 8 = clear (these names really only make
     # sense for small zenith angles, but...) these values will
     # eventually be used as indicies for coeffecient look ups
-    ebin = np.digitize(eps, (0., 1.065, 1.23, 1.5, 1.95, 2.8, 4.5, 6.2))
-    ebin[np.isnan(eps)] = 0
+    ebin = np.zeros_like(eps, dtype=np.int8)
+    ebin[eps < 1.065] = 1
+    ebin[(eps >= 1.065) & (eps < 1.23)] = 2
+    ebin[(eps >= 1.23) & (eps < 1.5)] = 3
+    ebin[(eps >= 1.5) & (eps < 1.95)] = 4
+    ebin[(eps >= 1.95) & (eps < 2.8)] = 5
+    ebin[(eps >= 2.8) & (eps < 4.5)] = 6
+    ebin[(eps >= 4.5) & (eps < 6.2)] = 7
+    ebin[eps >= 6.2] = 8
 
     # correct for 0 indexing in coeffecient lookup
     # later, ebin = -1 will yield nan coefficients
@@ -1311,7 +1333,7 @@ def dirindex(ghi, ghi_clearsky, dni_clearsky, zenith, times, pressure=101325.,
     Determine DNI from GHI using the DIRINDEX model, which is a modification of
     the DIRINT model with information from a clear sky model.
 
-    DIRINDEX [1] improves upon the DIRINT model by taking into account
+    DIRINDEX [1] improves upon the DIRINT model by taking into account 
     turbidity when used with the Ineichen clear sky model results.
 
     Parameters
@@ -1374,7 +1396,7 @@ def dirindex(ghi, ghi_clearsky, dni_clearsky, zenith, times, pressure=101325.,
                         use_delta_kt_prime=use_delta_kt_prime,
                         temp_dew=temp_dew)
 
-    dni_dirint_clearsky = dirint(ghi_clearsky, zenith, times,
+    dni_dirint_clearsky = dirint(ghi_clearsky, zenith, times, 
                                  pressure=pressure,
                                  use_delta_kt_prime=use_delta_kt_prime,
                                  temp_dew=temp_dew)