Skip to content

Commit f750b7c

Browse files
committed
Merge branch 'main' into fix_some_examples_not_run_by_sphinx
2 parents 4b58f90 + c34058d commit f750b7c

7 files changed

Lines changed: 24 additions & 34 deletions

File tree

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Contributing
22
============
33

4-
We welcome your contributions! Please see the [contributing](http://pvlib-python.readthedocs.io/en/latest/contributing.html) page for information about how to contribute.
4+
We welcome your contributions! Please see the [contributing](https://pvlib-python.readthedocs.io/en/stable/contributing/index.html) page for information about how to contribute.

docs/examples/system-models/NX_oedi_9068.py

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"""
88
# %%
99
# This example model uses satellite-based solar resource data from the
10-
# NSRDB PSM3. This approach is useful for pre-construction energy modeling
10+
# NSRDB PSM4. This approach is useful for pre-construction energy modeling
1111
# and in retrospective analyses where the system’s own irradiance
1212
# measurements are not present or unreliable.
1313
#
@@ -142,17 +142,18 @@
142142
#
143143
# The system does have measured plane-of-array irradiance data, but the
144144
# measurements suffer from row-to-row shading and tracker stalls. In this
145-
# example, we will use weather data taken from the NSRDB PSM3 for the year
145+
# example, we will use weather data taken from the NSRDB PSM4 for the year
146146
# 2019.
147147

148148
api_key = 'DEMO_KEY'
149149
email = 'your_email@domain.com'
150150

151151
keys = ['ghi', 'dni', 'dhi', 'temp_air', 'wind_speed',
152152
'albedo', 'precipitable_water']
153-
psm3, psm3_metadata = pvlib.iotools.get_nsrdb_psm4_conus(latitude, longitude,
153+
psm4, psm4_metadata = pvlib.iotools.get_nsrdb_psm4_conus(latitude, longitude,
154154
api_key, email,
155-
year=2019, interval=5,
155+
year=2019,
156+
time_step=5,
156157
parameters=keys,
157158
map_variables=True,
158159
leap_day=True)
@@ -174,20 +175,20 @@
174175
# module fraction and returns the average irradiance over the total module
175176
# surface.
176177

177-
solar_position = location.get_solarposition(psm3.index)
178+
solar_position = location.get_solarposition(psm4.index)
178179
tracker_angles = mount.get_orientation(
179180
solar_position['apparent_zenith'],
180181
solar_position['azimuth']
181182
)
182-
dni_extra = pvlib.irradiance.get_extra_radiation(psm3.index)
183+
dni_extra = pvlib.irradiance.get_extra_radiation(psm4.index)
183184

184185
# note: this system is monofacial, so only calculate irradiance for the
185186
# front side:
186187
averaged_irradiance = pvlib.bifacial.infinite_sheds.get_irradiance_poa(
187188
tracker_angles['surface_tilt'], tracker_angles['surface_azimuth'],
188189
solar_position['apparent_zenith'], solar_position['azimuth'],
189190
gcr, axis_height, pitch,
190-
psm3['ghi'], psm3['dhi'], psm3['dni'], psm3['albedo'],
191+
psm4['ghi'], psm4['dhi'], psm4['dni'], psm4['albedo'],
191192
model='haydavies', dni_extra=dni_extra,
192193
)
193194

@@ -198,14 +199,14 @@
198199

199200
cell_temperature_steady_state = pvlib.temperature.faiman(
200201
poa_global=averaged_irradiance['poa_global'],
201-
temp_air=psm3['temp_air'],
202-
wind_speed=psm3['wind_speed'],
202+
temp_air=psm4['temp_air'],
203+
wind_speed=psm4['wind_speed'],
203204
**temperature_model_parameters,
204205
)
205206

206207
cell_temperature = pvlib.temperature.prilliman(
207208
cell_temperature_steady_state,
208-
psm3['wind_speed'],
209+
psm4['wind_speed'],
209210
unit_mass=module_unit_mass
210211
)
211212

@@ -222,7 +223,7 @@
222223
'poa_direct': averaged_irradiance['poa_direct'],
223224
'poa_diffuse': averaged_irradiance['poa_diffuse'],
224225
'cell_temperature': cell_temperature,
225-
'precipitable_water': psm3['precipitable_water'], # for the spectral model
226+
'precipitable_water': psm4['precipitable_water'], # for the spectral model
226227
})
227228
model.run_model_from_poa(weather_inputs)
228229

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ Enhancements
2222

2323
Documentation
2424
~~~~~~~~~~~~~
25+
* Fix broken link in GitHub Contributing tab. (:issue:`2628`, :pull:`2806`)
26+
* Fixed broken ``interval`` keyword argument in the ``oedi_9068`` gallery
27+
example; the correct parameter name is ``time_step``. (:issue:`2791`)
2528

2629

2730
Testing
@@ -42,4 +45,6 @@ Maintenance
4245

4346
Contributors
4447
~~~~~~~~~~~~
45-
48+
* Eesh Saxena (:ghuser:`eeshsaxena`)
49+
* Karl Hill (:ghuser:`karlhillx`)
50+
* Yonry Zhu (:ghuser:`yonryzhu`)

pvlib/bifacial/infinite_sheds.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,6 @@ def _poa_sky_diffuse_pv(dhi, gcr, surface_tilt):
4545
Integrated view factors from the shaded and unshaded parts of
4646
the row slant height to the sky.
4747
48-
Parameters
49-
----------
50-
f_x : numeric
51-
Fraction of row slant height from the bottom that is shaded from
52-
direct irradiance. [unitless]
53-
surface_tilt : numeric
54-
Surface tilt angle in degrees from horizontal, e.g., surface facing up
55-
= 0, surface facing horizon = 90. [degree]
56-
gcr : float
57-
Ratio of row slant length to row spacing (pitch). [unitless]
58-
npoints : int, default 100
59-
Number of points for integration. [unitless]
60-
6148
A detailed calculation would be
6249
6350
dhi * (f_x * vf_shade_sky_integ + (1 - f_x) * vf_noshade_sky_integ)
@@ -73,9 +60,6 @@ def _poa_sky_diffuse_pv(dhi, gcr, surface_tilt):
7360
7461
Parameters
7562
----------
76-
f_x : numeric
77-
Fraction of row slant height from the bottom that is shaded from
78-
direct irradiance. [unitless]
7963
dhi : numeric
8064
Diffuse horizontal irradiance (DHI). [W/m^2]
8165
gcr : float

pvlib/irradiance.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3122,8 +3122,8 @@ def _liujordan(zenith, transmittance, airmass, dni_extra=1367.0):
31223122
transmittance: float
31233123
Atmospheric transmittance between 0 and 1.
31243124
3125-
pressure: float, default 101325.0
3126-
Air pressure
3125+
airmass: numeric
3126+
Optical air mass. [unitless]
31273127
31283128
dni_extra: float, default 1367.0
31293129
Direct irradiance incident at the top of the atmosphere.

pvlib/pvsystem.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ def get_iam(self, aoi, iam_model='physical'):
395395
aoi : numeric or tuple of numeric
396396
The angle of incidence in degrees.
397397
398-
aoi_model : string, default 'physical'
398+
iam_model : string, default 'physical'
399399
The IAM model to be used. Valid strings are 'physical', 'ashrae',
400400
'martin_ruiz', 'sapm' and 'interp'.
401401
Returns
@@ -1188,7 +1188,7 @@ def get_iam(self, aoi, iam_model='physical'):
11881188
aoi : numeric
11891189
The angle of incidence in degrees.
11901190
1191-
aoi_model : string, default 'physical'
1191+
iam_model : string, default 'physical'
11921192
The IAM model to be used. Valid strings are 'physical', 'ashrae',
11931193
'martin_ruiz', 'sapm' and 'interp'.
11941194

pvlib/solarposition.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ def sun_rise_set_transit_ephem(times, latitude, longitude,
516516
517517
Parameters
518518
----------
519-
time : pandas.DatetimeIndex
519+
times : pandas.DatetimeIndex
520520
Must be localized
521521
latitude : float
522522
Latitude in degrees, positive north of equator, negative to south

0 commit comments

Comments
 (0)