Skip to content

Commit ffb86bb

Browse files
cwhanseAdamRJensenkandersolar
authored
Fix some broken links (#1957)
* fix some broken links * Remove trailing white space * Update pvlib/iotools/srml.py Co-authored-by: Adam R. Jensen <[email protected]> * whatsnew * fix link formatting * Apply suggestions from code review --------- Co-authored-by: Adam R. Jensen <[email protected]> Co-authored-by: Kevin Anderson <[email protected]>
1 parent 6bb149f commit ffb86bb

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Testing
2020

2121
Documentation
2222
~~~~~~~~~~~~~
23-
23+
* Fixed broken URLs in various docstrings. (:pull:`1957`)
2424

2525
Requirements
2626
~~~~~~~~~~~~

pvlib/iam.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ def ashrae(aoi, b=0.05):
6969
7070
.. [2] ASHRAE standard 93-77
7171
72-
.. [3] PVsyst Contextual Help.
73-
https://files.pvsyst.com/help/index.html?iam_loss.htm retrieved on
74-
October 14, 2019
72+
.. [3] PVsyst 7 Help.
73+
https://www.pvsyst.com/help/index.html?iam_loss.htm retrieved on
74+
January 30, 2024
7575
7676
See Also
7777
--------

pvlib/iotools/srml.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# pvlib names. For most variables, only the first three digits are used,
1313
# the fourth indicating the instrument. Spectral data (7xxx) uses all
1414
# four digits to indicate the variable. See a full list of data element
15-
# numbers `here. <http://solardat.uoregon.edu/DataElementNumbers.html>`_
15+
# numbers `here. <http://solardata.uoregon.edu/DataElementNumbers.html>`_
1616

1717
VARIABLE_MAP = {
1818
'100': 'ghi',
@@ -60,9 +60,9 @@ def read_srml(filename, map_variables=True):
6060
References
6161
----------
6262
.. [1] University of Oregon Solar Radiation Monitoring Laboratory
63-
`http://solardat.uoregon.edu/ <http://solardat.uoregon.edu/>`_
63+
http://solardata.uoregon.edu/
6464
.. [2] `Archival (short interval) data files
65-
<http://solardat.uoregon.edu/ArchivalFiles.html>`_
65+
<http://solardata.uoregon.edu/ArchivalFiles.html>`_
6666
"""
6767
tsv_data = pd.read_csv(filename, delimiter='\t')
6868
data = _format_index(tsv_data)
@@ -218,20 +218,20 @@ def read_srml_month_from_solardat(station, year, month, filetype='PO',
218218
References
219219
----------
220220
.. [1] University of Oregon Solar Radiation Measurement Laboratory
221-
`http://solardat.uoregon.edu/ <http://solardat.uoregon.edu/>`_
221+
http://solardata.uoregon.edu/
222222
"""
223223
file_name = "{station}{filetype}{year:02d}{month:02d}.txt".format(
224224
station=station,
225225
filetype=filetype,
226226
year=year % 100,
227227
month=month)
228-
url = "http://solardat.uoregon.edu/download/Archive/"
228+
url = "http://solardata.uoregon.edu/download/Archive/"
229229
data = read_srml(url + file_name, map_variables=map_variables)
230230
return data
231231

232232

233233
def get_srml(station, start, end, filetype='PO', map_variables=True,
234-
url="http://solardat.uoregon.edu/download/Archive/"):
234+
url="http://solardata.uoregon.edu/download/Archive/"):
235235
"""Request data from UoO SRML and read it into a Dataframe.
236236
237237
The University of Oregon Solar Radiation Monitoring Laboratory (SRML) is
@@ -252,7 +252,7 @@ def get_srml(station, start, end, filetype='PO', map_variables=True,
252252
map_variables : bool, default: True
253253
When true, renames columns of the DataFrame to pvlib variable names
254254
where applicable. See variable :const:`VARIABLE_MAP`.
255-
url : str, default: 'http://solardat.uoregon.edu/download/Archive/'
255+
url : str, default: 'http://solardata.uoregon.edu/download/Archive/'
256256
API endpoint URL
257257
258258
Returns
@@ -287,10 +287,9 @@ def get_srml(station, start, end, filetype='PO', map_variables=True,
287287
References
288288
----------
289289
.. [1] University of Oregon Solar Radiation Measurement Laboratory
290-
`http://solardat.uoregon.edu/ <http://solardat.uoregon.edu/>`_
290+
http://solardata.uoregon.edu/
291291
.. [2] Station ID codes - Solar Radiation Measurement Laboratory
292-
`http://solardat.uoregon.edu/StationIDCodes.html
293-
<http://solardat.uoregon.edu/StationIDCodes.html>`_
292+
http://solardata.uoregon.edu/StationIDCodes.html
294293
"""
295294
# Use pd.to_datetime so that strings (e.g. '2021-01-01') are accepted
296295
start = pd.to_datetime(start)

pvlib/irradiance.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1,
7373
Clear Sky Models: Implementation and Analysis", Sandia National
7474
Laboratories, SAND2012-2389, 2012.
7575
76-
.. [2] <http://solardat.uoregon.edu/SolarRadiationBasics.html>, Eqs.
76+
.. [2] http://solardata.uoregon.edu/SolarRadiationBasics.html, Eqs.
7777
SR1 and SR2
7878
7979
.. [3] Partridge, G. W. and Platt, C. M. R. 1976. Radiative Processes

pvlib/solarposition.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def get_solarposition(time, latitude, longitude,
8989
solar radiation applications. Solar Energy, vol. 81, no. 6, p. 838,
9090
2007.
9191
92-
.. [3] NREL SPA code: http://rredc.nrel.gov/solar/codesandalgorithms/spa/
92+
.. [3] NREL SPA code: https://midcdmz.nrel.gov/spa/
9393
"""
9494

9595
if altitude is None and pressure is None:
@@ -186,8 +186,8 @@ def spa_c(time, latitude, longitude, pressure=101325, altitude=0,
186186
redefined by Python>=3.5. This issue is
187187
`Python bug 24643 <https://bugs.python.org/issue24643>`_.
188188
189-
.. [2] USNO delta T:
190-
http://www.usno.navy.mil/USNO/earth-orientation/eo-products/long-term
189+
.. [2] Delta T:
190+
https://en.wikipedia.org/wiki/%CE%94T_(timekeeping)
191191
192192
See also
193193
--------
@@ -1327,9 +1327,9 @@ def solar_zenith_analytical(latitude, hourangle, declination):
13271327
.. [4] `Wikipedia: Solar Zenith Angle
13281328
<https://en.wikipedia.org/wiki/Solar_zenith_angle>`_
13291329
1330-
.. [5] `PVCDROM: Sun's Position
1331-
<http://www.pveducation.org/pvcdrom/2-properties-sunlight/
1332-
suns-position>`_
1330+
.. [5] `PVCDROM: Elevation Angle
1331+
<https://www.pveducation.org/pvcdrom/properties-of-sunlight/
1332+
elevation-angle>`_
13331333
13341334
See Also
13351335
--------

pvlib/temperature.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,8 +362,9 @@ def pvsyst_cell(poa_global, temp_air, wind_speed=1.0, u_c=29.0, u_v=0.0,
362362
363363
References
364364
----------
365-
.. [1] "PVsyst 6 Help", Files.pvsyst.com, 2018. [Online]. Available:
366-
http://files.pvsyst.com/help/index.html. [Accessed: 10- Dec- 2018].
365+
.. [1] "PVsyst 7 Help", [Online]. Available:
366+
https://www.pvsyst.com/help/index.html?thermal_loss.htm.
367+
[Accessed: 30-Jan-2024].
367368
368369
.. [2] Faiman, D. (2008). "Assessing the outdoor operating temperature of
369370
photovoltaic modules." Progress in Photovoltaics 16(4): 307-315.

0 commit comments

Comments
 (0)