pvlib · wholmgren · Sep 16, 2020 · Sep 14, 2020 · Sep 14, 2020 · Sep 14, 2020
diff --git a/benchmarks/asv.conf.json b/benchmarks/asv.conf.json
@@ -121,6 +121,7 @@
             // Note: these don't have a minimum in setup.py
             "pytables": "3.6.1",
             "ephem": "3.7.6.0",
+            "numba": "0.36.1",
         },
         // latest versions available
         {
@@ -130,6 +131,7 @@
             "scipy": "",
             "pytables": "",
             "ephem": "",
+            "numba": ""
         },
     ],
     "exclude": [

diff --git a/benchmarks/benchmarks/solarposition.py b/benchmarks/benchmarks/solarposition.py
@@ -2,6 +2,7 @@
 ASV benchmarks for solarposition.py
 """
 
+import datetime
 import pandas as pd
 import pvlib
 from pvlib import solarposition
@@ -16,28 +17,68 @@
 
 
 class SolarPosition:
+    params = [1, 10, 100]  # number of days
+    param_names = ['ndays']
 
-    def setup(self):
+    def setup(self, ndays):
         self.times = pd.date_range(start='20180601', freq='1min',
-                                   periods=14400)
+                                   periods=1440*ndays)
         self.times_localized = self.times.tz_localize('Etc/GMT+7')
         self.lat = 35.1
         self.lon = -106.6
+        self.times_daily = pd.date_range(
+            start='20180601', freq='24h', periods=ndays, tz='Etc/GMT+7')
 
     # GH 512
-    def time_ephemeris(self):
+    def time_ephemeris(self, ndays):
         solarposition.ephemeris(self.times, self.lat, self.lon)
 
     # GH 512
-    def time_ephemeris_localized(self):
+    def time_ephemeris_localized(self, ndays):
         solarposition.ephemeris(self.times_localized, self.lat, self.lon)
 
-    def time_spa_python(self):
-        solarposition.spa_python(self.times_localized[::5], self.lat, self.lon)
+    def time_spa_python(self, ndays):
+        solarposition.spa_python(self.times_localized, self.lat, self.lon)
+
+    def time_pyephem(self, ndays):
+        solarposition.pyephem(self.times_localized, self.lat, self.lon)
+
+    def time_sun_rise_set_transit_spa(self, ndays):
+        sun_rise_set_transit_spa(self.times_daily, self.lat, self.lon)
 
-    def time_sun_rise_set_transit_spa(self):
-        sun_rise_set_transit_spa(self.times_localized[::30],
-                                 self.lat, self.lon)
+    def time_sun_rise_set_transit_ephem(self, ndays):
+        solarposition.sun_rise_set_transit_ephem(
+            self.times_daily, self.lat, self.lon)
 
-    def time_nrel_earthsun_distance(self):
+    def time_sun_rise_set_transit_geometric_full_comparison(self, ndays):
+        dayofyear = self.times_daily.dayofyear
+        declination = solarposition.declination_spencer71(dayofyear)
+        equation_of_time = solarposition.equation_of_time_spencer71(dayofyear)
+        solarposition.sun_rise_set_transit_geometric(
+            self.times_daily, self.lat, self.lon, declination,
+            equation_of_time)
+
+    def time_nrel_earthsun_distance(self, ndays):
         solarposition.nrel_earthsun_distance(self.times_localized)
+
+
+class SolarPositionCalcTime:
+
+    def setup(self):
+        # test calc_time for finding times at which sun is 3 degrees
+        # above the horizon.
+        # Tucson 2020-09-14 sunrise at 6:08 AM MST, 13:08 UTC
+        # according to google.
+        self.start = datetime.datetime(2020, 9, 14, 12)
+        self.end = datetime.datetime(2020, 9, 14, 15)
+        self.value = 0.05235987755982988
+        self.lat = 32.2
+        self.lon = -110.9
+        self.attribute = 'alt'
+
+    def time_calc_time(self):
+        # datetime.datetime(2020, 9, 14, 13, 24, 13, 861913, tzinfo=<UTC>)
+        solarposition.calc_time(
+            self.start, self.end, self.lat, self.lon, self.attribute,
+            self.value
+        )
diff --git a/benchmarks/benchmarks/solarposition_numba.py b/benchmarks/benchmarks/solarposition_numba.py
@@ -0,0 +1,46 @@
+"""ASV benchmarks for solarposition.py using numba.
+
+We use a separate module so that we can control the pvlib import process
+using an environment variable. This will force pvlib to compile the numba
+code during setup.
+
+Try to keep relevant sections in sync with benchmarks/solarposition.py
+"""
+
+from pkg_resources import parse_version
+import pandas as pd
+
+import os
+os.environ['PVLIB_USE_NUMBA'] = '1'
+
+
+import pvlib  # NOQA: E402
+from pvlib import solarposition  # NOQA: E402
+
+
+if parse_version(pvlib.__version__) >= parse_version('0.6.1'):
+    sun_rise_set_transit_spa = solarposition.sun_rise_set_transit_spa
+else:
+    sun_rise_set_transit_spa = solarposition.get_sun_rise_set_transit
+
+
+class SolarPositionNumba:
+    params = [1, 10, 100]  # number of days
+    param_names = ['ndays']
+
+    def setup(self, ndays):
+        self.times = pd.date_range(start='20180601', freq='1min',
+                                   periods=1440*ndays)
+        self.times_localized = self.times.tz_localize('Etc/GMT+7')
+        self.lat = 35.1
+        self.lon = -106.6
+        self.times_daily = pd.date_range(
+            start='20180601', freq='24h', periods=ndays, tz='Etc/GMT+7')
+
+    def time_spa_python(self, ndays):
+        solarposition.spa_python(
+            self.times_localized, self.lat, self.lon, how='numba')
+
+    def time_sun_rise_set_transit_spa(self, ndays):
+        sun_rise_set_transit_spa(
+            self.times_daily, self.lat, self.lon, how='numba')
diff --git a/benchmarks/benchmarks/temperature.py b/benchmarks/benchmarks/temperature.py
@@ -13,7 +13,7 @@ def set_weather_data(obj):
                               periods=14400)
     obj.poa = pd.Series(1000, index=obj.times)
     obj.tamb = pd.Series(20, index=obj.times)
-    obj.windspeed = pd.Series(2, index=obj.times)
+    obj.wind_speed = pd.Series(2, index=obj.times)
 
 
 class SAPM:
@@ -35,7 +35,7 @@ def sapm_cell_wrapper(poa_global, temp_air, wind_speed):
 
     def time_sapm_cell(self):
         # use version-appropriate wrapper
-        self.sapm_cell_wrapper(self.poa, self.tamb, self.windspeed)
+        self.sapm_cell_wrapper(self.poa, self.tamb, self.wind_speed)
 
 
 class Fuentes:

diff --git a/docs/sphinx/source/whatsnew/v0.8.1.rst b/docs/sphinx/source/whatsnew/v0.8.1.rst
@@ -22,7 +22,7 @@ Bug fixes
 Testing
 ~~~~~~~
 * Add airspeed velocity performance testing configuration and a few benchmarks.
-  (:issue:`419`, :pull:`1049`)
+  (:issue:`419`, :pull:`1049`, :pull:`1059`)
 
 Documentation
 ~~~~~~~~~~~~~

diff --git a/docs/tutorials/solarposition.ipynb b/docs/tutorials/solarposition.ipynb