Merge branch 'main' of https://github.com/pvlib/pvlib-python into pvsystem-temp-models

Author: cwhanse

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

@@ -31,6 +31,7 @@ Enhancements
   (:issue:`2714`, :pull:`2715`)
 * Include `ross` and `faiman_rad` in the allowed models within 
   :py:meth:`pvlib.pvsystem.PVSystem.get_cell_temperature` (:issue:`2625`, :pull:`2631`)  
+* Accelerate the internals of :py:func:`~pvlib.solarpostion.ephemeris`. (:pull:`2626`)
 
 Documentation
 ~~~~~~~~~~~~~
@@ -86,3 +87,5 @@ Contributors
 * Marco Fumagalli (:ghuser:`fuma900`)
 * Jean-Baptiste Pasquier (:ghuser:`pasquierjb`)
 * Rodrigo Amaro e Silva (:ghuser:`ramaroesilva`)
+* James Fulton (:ghuser:`dfulu`)
+

pvlib/solarposition.py

@@ -826,34 +826,43 @@ def ephemeris(time, latitude, longitude, pressure=101325.0, temperature=12.0):
 
     # Calculate refraction correction
     Elevation = SunEl
-    TanEl = pd.Series(np.tan(np.radians(Elevation)), index=time_utc)
-    Refract = pd.Series(0., index=time_utc)
-
-    Refract[(Elevation > 5) & (Elevation <= 85)] = (
-        58.1/TanEl - 0.07/(TanEl**3) + 8.6e-05/(TanEl**5))
-
-    Refract[(Elevation > -0.575) & (Elevation <= 5)] = (
-        Elevation *
-        (-518.2 + Elevation*(103.4 + Elevation*(-12.79 + Elevation*0.711))) +
-        1735)
+    TanEl = np.tan(np.radians(Elevation))
+    Refract = np.zeros(len(time_utc))
+
+    mask = (Elevation > 5) & (Elevation <= 85)
+    Refract[mask] = (
+        58.1/TanEl[mask] - 0.07/(TanEl[mask]**3) + 8.6e-05/(TanEl[mask]**5))
+
+    mask = (Elevation > -0.575) & (Elevation <= 5)
+    Refract[mask] = (
+        Elevation[mask] * (
+            -518.2 + Elevation[mask]*(
+                103.4 + Elevation[mask]*(-12.79 + Elevation[mask]*0.711)
+            )
+        ) + 1735
+    )
 
-    Refract[(Elevation > -1) & (Elevation <= -0.575)] = -20.774 / TanEl
+    mask = (Elevation > -1) & (Elevation <= -0.575)
+    Refract[mask] = -20.774 / TanEl[mask]
 
     Refract *= (283/(273. + temperature)) * (pressure/101325.) / 3600.
 
     ApparentSunEl = SunEl + Refract
 
     # make output DataFrame
-    DFOut = pd.DataFrame(index=time_utc)
-    DFOut['apparent_elevation'] = ApparentSunEl
-    DFOut['elevation'] = SunEl
-    DFOut['azimuth'] = SunAz
-    DFOut['apparent_zenith'] = 90 - ApparentSunEl
-    DFOut['zenith'] = 90 - SunEl
-    DFOut['solar_time'] = SolarTime
-    DFOut.index = time
-
-    return DFOut
+    result = pd.DataFrame(
+        {
+            "apparent_elevation": ApparentSunEl,
+            "elevation": SunEl,
+            "azimuth": SunAz,
+            "apparent_zenith": 90 - ApparentSunEl,
+            "zenith": 90 - SunEl,
+            "solar_time": SolarTime,
+        },
+        index=time
+    )
+
+    return result
 
 
 def calc_time(lower_bound, upper_bound, latitude, longitude, attribute, value,