Revert solar_zenith to apparent_zenith

Author: AdamRJensen

docs/examples/agrivoltaics/plot_agrivoltaics_ground_irradiance.py

@@ -58,7 +58,7 @@
 # of the trackers. For a single-axis tracker, this can be calculated as:
 
 tracking_orientations = pvlib.tracking.singleaxis(
-    solar_zenith=solpos['apparent_zenith'],
+    apparent_zenith=solpos['apparent_zenith'],
     solar_azimuth=solpos['azimuth'],
     axis_azimuth=axis_azimuth,
     max_angle=max_angle,

docs/examples/shading/plot_martinez_shade_loss.py

@@ -89,7 +89,7 @@
 )  # unpack for better readability
 
 tracking_result = pvlib.tracking.singleaxis(
-    solar_zenith=solar_apparent_zenith,
+    apparent_zenith=solar_apparent_zenith,
     solar_azimuth=solar_azimuth,
     axis_tilt=axis_tilt,
     axis_azimuth=axis_azimuth,

docs/examples/solar-tracking/plot_single_axis_tracking.py

@@ -32,7 +32,7 @@
 solpos = solarposition.get_solarposition(times, lat, lon)
 
 truetracking_angles = tracking.singleaxis(
-    solar_zenith=solpos['apparent_zenith'],
+    apparent_zenith=solpos['apparent_zenith'],
     solar_azimuth=solpos['azimuth'],
     axis_tilt=0,
     axis_azimuth=180,
@@ -60,7 +60,7 @@
 
 for gcr in [0.2, 0.4, 0.6]:
     backtracking_angles = tracking.singleaxis(
-        solar_zenith=solpos['apparent_zenith'],
+        apparent=solpos['apparent_zenith'],
         solar_azimuth=solpos['azimuth'],
         axis_tilt=0,
         axis_azimuth=180,

docs/examples/solar-tracking/plot_single_axis_tracking_on_sloped_terrain.py

@@ -99,7 +99,7 @@
 fig, ax = plt.subplots()
 for cross_axis_tilt in [0, 5, 10]:
     tracker_data = tracking.singleaxis(
-        solar_zenith=solpos['apparent_zenith'],
+        apparent=solpos['apparent_zenith'],
         solar_azimuth=solpos['azimuth'],
         axis_tilt=0,  # flat because the axis is perpendicular to the slope
         axis_azimuth=180,  # N-S axis, azimuth facing south
@@ -155,7 +155,7 @@
 # before:
 
 tracker_data = tracking.singleaxis(
-    solar_zenith=solpos['apparent_zenith'],
+    apparent=solpos['apparent_zenith'],
     solar_azimuth=solpos['azimuth'],
     axis_tilt=axis_tilt,  # no longer flat because the terrain imparts a tilt
     axis_azimuth=axis_azimuth,

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

@@ -10,8 +10,7 @@ Breaking Changes
 
 Deprecations
 ~~~~~~~~~~~~
-* Rename parameter name ``aparent_zenith`` to ``solar_zenith`` and ``aparent_azimuth``
-  to ``solar_azimuth`` in :py:func:`~pvlib.tracking.singleaxis`.
+* Rename parameter name ``aparent_azimuth`` to ``solar_azimuth`` in :py:func:`~pvlib.tracking.singleaxis`.
   (:issue:`2479`, :pull:`2480`)
 
 Bug fixes

pvlib/tracking.py

@@ -7,10 +7,6 @@
 from pvlib._deprecation import renamed_kwarg_warning
 
 
-@renamed_kwarg_warning(
-    since='0.13.1',
-    old_param_name='apparent_zenith',
-    new_param_name='solar_zenith')
 @renamed_kwarg_warning(
     since='0.13.1',
     old_param_name='apparent_azimuth',
@@ -39,7 +35,7 @@ def singleaxis(solar_zenith, solar_azimuth,
 
     Parameters
     ----------
-    solar_zenith : float, 1d array, or Series
+    apparent_zenith : float, 1d array, or Series
         Solar apparent zenith angles in decimal degrees.
 
     solar_azimuth : float, 1d array, or Series
@@ -126,14 +122,14 @@ def singleaxis(solar_zenith, solar_azimuth,
     # MATLAB to Python conversion by
     # Will Holmgren (@wholmgren), U. Arizona. March, 2015.
 
-    if isinstance(solar_zenith, pd.Series):
-        index = solar_zenith.index
+    if isinstance(apparent_zenith, pd.Series):
+        index = apparent_zenith.index
     else:
         index = None
 
     # convert scalars to arrays
     solar_azimuth = np.atleast_1d(solar_azimuth)
-    solar_zenith = np.atleast_1d(solar_zenith)
+    apparent_zenith = np.atleast_1d(apparent_zenith)
 
     if solar_azimuth.ndim > 1 or solar_zenith.ndim > 1:
         raise ValueError('Input dimensions must not exceed 1')
@@ -150,12 +146,12 @@ def singleaxis(solar_zenith, solar_azimuth,
     omega_ideal = shading.projected_solar_zenith_angle(
         axis_tilt=axis_tilt,
         axis_azimuth=axis_azimuth,
-        solar_zenith=solar_zenith,
+        solar_zenith=apparent_zenith,
         solar_azimuth=solar_azimuth,
     )
 
     # filter for sun above panel horizon
-    zen_gt_90 = solar_zenith > 90
+    zen_gt_90 = apparent_zenith > 90
     omega_ideal[zen_gt_90] = np.nan
 
     # Account for backtracking
@@ -200,7 +196,7 @@ def singleaxis(solar_zenith, solar_azimuth,
     surface_tilt = surface['surface_tilt']
     surface_azimuth = surface['surface_azimuth']
     aoi = irradiance.aoi(surface_tilt, surface_azimuth,
-                         solar_zenith, solar_azimuth)
+                         apparent_zenith, solar_azimuth)
 
     # Bundle DataFrame for return values and filter for sun below horizon.
     out = {'tracker_theta': tracker_theta, 'aoi': aoi,