Skip to content

Commit eb94583

Browse files
authored
Merge branch 'main' into lambertw
2 parents 189d8fb + 92bb1e5 commit eb94583

44 files changed

Lines changed: 343 additions & 229 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/pytest-remote-data.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
shell: bash -l {0} # necessary for conda env to be active
9797
env:
9898
# copy GitHub Secrets into environment variables for the tests to access
99-
NREL_API_KEY: ${{ secrets.NRELAPIKEY }}
99+
NLR_API_KEY: ${{ secrets.NRELAPIKEY }}
100100
SOLARANYWHERE_API_KEY: ${{ secrets.SOLARANYWHERE_API_KEY }}
101101
BSRN_FTP_USERNAME: ${{ secrets.BSRN_FTP_USERNAME }}
102102
BSRN_FTP_PASSWORD: ${{ secrets.BSRN_FTP_PASSWORD }}

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,8 @@ coverage.xml
9999
env
100100
results
101101

102+
103+
# Gas Town runtime
104+
.beads/
105+
.claude/
106+
.runtime/

docs/examples/bifacial/plot_irradiance_nonuniformity_loss.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
# described in Figure 1 (A), [1]_. We will cover this case for educational
4848
# purposes, although it can be achieved with the packages
4949
# `solarfactors <https://github.com/pvlib/solarfactors/>`_ and
50-
# `bifacial_radiance <https://github.com/NREL/bifacial_radiance>`_.
50+
# `bifacial_radiance <https://github.com/NatLabRockies/bifacial_radiance>`_.
5151
#
5252
# Here we set and plot the global irradiance level of each cell.
5353

docs/examples/irradiance-decomposition/plot_diffuse_fraction.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
# ----
5353
#
5454
# DISC :py:func:`~pvlib.irradiance.disc` is an empirical correlation developed
55-
# at SERI (now NREL) in 1987. The direct normal irradiance (DNI) is related to
55+
# at SERI (now NLR) in 1987. The direct normal irradiance (DNI) is related to
5656
# clearness index (kt) by two polynomials split at kt = 0.6, then combined with
5757
# an exponential relation with airmass.
5858

@@ -216,5 +216,5 @@
216216
# correlations, which include additional variables such as airmass. These
217217
# methods seem to reduce DNI spikes over 1000 [W/m^2].
218218
#
219-
# .. _TMY3: https://www.nrel.gov/docs/fy08osti/43156.pdf
220-
# .. _NSRDB: https://www.nrel.gov/docs/fy12osti/54824.pdf
219+
# .. _TMY3: https://doi.org/10.2172/928611
220+
# .. _NSRDB: https://doi.org/10.2172/1054832

docs/examples/spectrum/average_photon_energy.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
from scipy.integrate import trapezoid
3535
from pvlib import spectrum, solarposition, irradiance, atmosphere
3636

37-
lat, lon = 39.742, -105.18 # NREL SRRL location
37+
lat, lon = 39.742, -105.18 # SRRL location
3838
surface_tilt = 25
3939
surface_azimuth = 180 # south-facing system
4040
pressure = 81190 # at 1828 metres AMSL, roughly
@@ -194,5 +194,5 @@
194194
# for the solar spectral influence on photovoltaic device performance."
195195
# Energy 286 :doi:`10.1016/j.energy.2023.129461`
196196
# .. [4] Bird Simple Spectral Model: spectrl2_2.c
197-
# https://www.nrel.gov/grid/solar-resource/spectral.html
198-
# (Last accessed: 18/09/2024)
197+
# https://www.nlr.gov/grid/solar-resource/spectral
198+
# (Last accessed: 03/03/2026)

docs/sphinx/source/reference/iotools.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ A solar radiation network in the USA, run by NOAA.
179179
MIDC
180180
^^^^
181181

182-
A solar radiation network in the USA, run by NREL.
182+
A solar radiation network in the USA, run by NLR (known as NREL prior to December 2025).
183183

184184
.. autosummary::
185185
:toctree: generated/

docs/sphinx/source/user_guide/extras/faq.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ The CEC table doesn't include my module or inverter, what should I do?
126126
----------------------------------------------------------------------
127127

128128
The CEC tables for module and inverter parameters included in pvlib are periodically
129-
copied from `SAM <https://github.com/NREL/SAM/tree/develop/deploy/libraries>`_,
129+
copied from `SAM <https://github.com/NatLabRockies/SAM/tree/develop/deploy/libraries>`_,
130130
so you can check the tables there for more up-to-date tables.
131131

132132
For modules, if even the SAM files don't include the module you're looking for

docs/sphinx/source/user_guide/getting_started/installation.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,15 +242,15 @@ pvlib-python is distributed with several validated, high-precision, and
242242
high-performance solar position calculators. We strongly recommend using
243243
the built-in solar position calculators.
244244

245-
pvlib-python also includes unsupported wrappers for the official NREL
246-
SPA algorithm. NREL's license does not allow redistribution of the
245+
pvlib-python also includes unsupported wrappers for the official NLR
246+
implementation of NREL SPA. NLR's license does not allow redistribution of the
247247
source code, so you must jump through some hoops to use it with pvlib.
248248
You will need a C compiler to use this code.
249249

250250
To install the NREL SPA algorithm for use with pvlib:
251251

252252
#. Download the pvlib repository (as described in :ref:`obtainsource`)
253-
#. Download the `SPA files from NREL <http://www.nrel.gov/midc/spa/>`_
253+
#. Download the `SPA files from NLR <http://www.nlr.gov/midc/spa/>`_
254254
#. Copy the SPA files into ``pvlib-python/pvlib/spa_c_files``
255255
#. From the ``pvlib-python`` directory, run ``pip uninstall pvlib``
256256
followed by ``pip install .``

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,22 @@ Bug fixes
2020
* Fix a division-by-zero condition in
2121
:py:func:`pvlib.transformer.simple_efficiency` when ``load_loss = 0``.
2222
(:issue:`2645`, :pull:`2646`)
23+
* Update URLs in :py:mod:`pvlib.iotools.psm4` to use nlr.gov instead of
24+
nrel.gov. (:issue:`2701`, :pull:`2705`)
25+
* Fix a bug in :py:func:`pvlib.iotools.era5._m_to_cm` where meters were
26+
incorrectly divided by 100 instead of multiplied, causing precipitations to be
27+
underestimated by a factor of 10,000 when ``map_variables=True``.
28+
(:issue:`2724`, :pull:`2725`)
29+
2330

2431
Enhancements
2532
~~~~~~~~~~~~
2633
* Use ``k`` and ``cap_adjustment`` from :py:func:`pvlib.pvsystem.Array.module_parameters`
2734
in :py:func:`pvlib.pvsystem.PVSystem.pvwatts_dc`
2835
(:issue:`2714`, :pull:`2715`)
36+
* Include `ross` and `faiman_rad` in the allowed models within
37+
:py:meth:`pvlib.pvsystem.PVSystem.get_cell_temperature` (:issue:`2625`, :pull:`2631`)
38+
* Accelerate the internals of :py:func:`~pvlib.solarpostion.ephemeris`. (:pull:`2626`)
2939

3040
Documentation
3141
~~~~~~~~~~~~~
@@ -67,6 +77,10 @@ Requirements
6777

6878
Maintenance
6979
~~~~~~~~~~~
80+
* Update all NREL references to NLR (National Laboratory of the Rockies)
81+
following the laboratory rename and domain migration from ``nrel.gov``
82+
to ``nlr.gov``. Rename ``NREL_API_KEY`` environment variable to
83+
``NLR_API_KEY``. (:issue:`2701`, :pull:`2705`)
7084

7185

7286
Contributors
@@ -77,6 +91,10 @@ Contributors
7791
* Cliff Hansen (:ghuser:`cwhanse`)
7892
* Anton Driesse (:ghuser:`adriesse`)
7993
* Kevin Anderson (:ghuser:`kandersolar`)
94+
* Jason Curtis (:ghuser:`jason-curtis`)
8095
* Rohan Saxena (:ghuser:`r0hansaxena`)
8196
* Marco Fumagalli (:ghuser:`fuma900`)
97+
* Jean-Baptiste Pasquier (:ghuser:`pasquierjb`)
98+
* Rodrigo Amaro e Silva (:ghuser:`ramaroesilva`)
99+
* James Fulton (:ghuser:`dfulu`)
82100

docs/tutorials/tmy_to_power.ipynb

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,7 @@
7070
{
7171
"cell_type": "markdown",
7272
"metadata": {},
73-
"source": [
74-
"pvlib comes with a couple of TMY files, and we'll use one of them for simplicity. You could also load a file from disk, or specify a url. See this NREL website for a list of TMY files:\n",
75-
"\n",
76-
"http://rredc.nrel.gov/solar/old_data/nsrdb/1991-2005/tmy3/by_state_and_city.html"
77-
]
73+
"source": "pvlib comes with a couple of TMY files, and we'll use one of them for simplicity. You could also load a file from disk, or specify a url. See this NLR website for a list of TMY files:\n\nhttps://nsrdb.nlr.gov/data-sets/archives"
7874
},
7975
{
8076
"cell_type": "code",
@@ -1515,13 +1511,7 @@
15151511
{
15161512
"cell_type": "markdown",
15171513
"metadata": {},
1518-
"source": [
1519-
"Next, we will assume that the SAPM model is representative of the real world performance so that we can use scipy's optimization routine to derive simulated PVUSA coefficients. You will need to install scipy to run these functions.\n",
1520-
"\n",
1521-
"Here's one PVUSA reference:\n",
1522-
"\n",
1523-
"http://www.nrel.gov/docs/fy09osti/45376.pdf\n"
1524-
]
1514+
"source": "Next, we will assume that the SAPM model is representative of the real world performance so that we can use scipy's optimization routine to derive simulated PVUSA coefficients. You will need to install scipy to run these functions.\n\nHere's one PVUSA reference:\n\nhttps://www.osti.gov/biblio/951223\n"
15251515
},
15261516
{
15271517
"cell_type": "code",

0 commit comments

Comments
 (0)