Skip to content

Commit d7f014a

Browse files
committed
Merge remote-tracking branch 'upstream/main' into pvsystem_sapm_table
2 parents 3d81b77 + 8a7927a commit d7f014a

13 files changed

+53945
-37
lines changed

docs/sphinx/source/reference/iotools.rst

+6
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ of sources and file formats relevant to solar energy modeling.
2626
iotools.read_crn
2727
iotools.read_solrad
2828
iotools.get_solrad
29+
iotools.get_nsrdb_psm4_aggregated
30+
iotools.get_nsrdb_psm4_tmy
31+
iotools.get_nsrdb_psm4_conus
32+
iotools.get_nsrdb_psm4_full_disc
33+
iotools.read_nsrdb_psm4
34+
iotools.parse_nsrdb_psm4
2935
iotools.get_psm3
3036
iotools.read_psm3
3137
iotools.parse_psm3

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

+10
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ Enhancements
1919
data (:py:func:`~pvlib.ivtools.sdm.fit_pvsyst_iec61853_sandia_2025`). (:issue:`2185`, :pull:`2429`)
2020
* Add optional arguments ``temperature_ref`` and ``irradiance_ref`` to
2121
:py:func:`~pvlib.pvsystem.sapm`(:issue:`2432`, :pull:`2434`)
22+
* Add NREL NSRDB PSM v4 API client to :py:mod:`pvlib.iotools`. See
23+
:py:func:`~pvlib.iotools.get_nsrdb_psm4_aggregated`,
24+
:py:func:`~pvlib.iotools.get_nsrdb_psm4_tmy`,
25+
:py:func:`~pvlib.iotools.get_nsrdb_psm4_conus`,
26+
:py:func:`~pvlib.iotools.get_nsrdb_psm4_full_disc`,
27+
:py:func:`~pvlib.iotools.read_nsrdb_psm4`, and
28+
:py:func:`~pvlib.iotools.parse_nsrdb_psm4`. (:issue:`2326`, :pull:`2378`)
2229

2330
Documentation
2431
~~~~~~~~~~~~~
@@ -27,6 +34,8 @@ Documentation
2734
(:issue:`2423`, :pull:`2426`)
2835
* Clarify which SAPM coefficients are required by the ``module`` parameter in
2936
:py:func:`~pvlib.pvsystem.sapm` (:issue:`2392`, :pull:`2435`)
37+
* Update references in :py:func`~pvlib.irradiance.get_extra_radiation`
38+
(:issue:`2333`, :pull:`2347`)
3039

3140
Requirements
3241
~~~~~~~~~~~~
@@ -46,5 +55,6 @@ Contributors
4655
~~~~~~~~~~~~
4756
* Cliff Hansen (:ghuser:`cwhanse`)
4857
* Rajiv Daxini (:ghuser:`RDaxini`)
58+
* Will Hobbs (:ghuser:`williamhobbs`)
4959
* Kevin Anderson (:ghuser:`kandersolar`)
5060
* Will Holmgren (:ghuser:`wholmgren`)

pvlib/iotools/__init__.py

+6
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
from pvlib.iotools.psm3 import get_psm3 # noqa: F401
1212
from pvlib.iotools.psm3 import read_psm3 # noqa: F401
1313
from pvlib.iotools.psm3 import parse_psm3 # noqa: F401
14+
from pvlib.iotools.psm4 import get_nsrdb_psm4_aggregated # noqa: F401
15+
from pvlib.iotools.psm4 import get_nsrdb_psm4_tmy # noqa: F401
16+
from pvlib.iotools.psm4 import get_nsrdb_psm4_conus # noqa: F401
17+
from pvlib.iotools.psm4 import get_nsrdb_psm4_full_disc # noqa: F401
18+
from pvlib.iotools.psm4 import read_nsrdb_psm4 # noqa: F401
19+
from pvlib.iotools.psm4 import parse_nsrdb_psm4 # noqa: F401
1420
from pvlib.iotools.pvgis import get_pvgis_tmy, read_pvgis_tmy # noqa: F401
1521
from pvlib.iotools.pvgis import read_pvgis_hourly # noqa: F401
1622
from pvlib.iotools.pvgis import get_pvgis_hourly # noqa: F401

0 commit comments

Comments
 (0)