Skip to content

Commit ff01c08

Browse files
committed
Merge remote-tracking branch 'upstream/main' into remove-basic-pvgis-outputformat
2 parents e3defba + d4dbe55 commit ff01c08

Some content is hidden

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

66 files changed

+91702
-28292
lines changed

docs/sphinx/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
intersphinx_mapping = {
6767
'python': ('https://docs.python.org/3/', None),
6868
'numpy': ('https://numpy.org/doc/stable/', None),
69-
'scipy': ('https://docs.scipy.org/doc/scipy/reference/', None),
69+
'scipy': ('https://docs.scipy.org/doc/scipy/', None),
7070
'pandas': ('https://pandas.pydata.org/pandas-docs/stable', None),
7171
'matplotlib': ('https://matplotlib.org/stable', None),
7272
}

docs/sphinx/source/reference/iotools.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ 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
2934
iotools.get_psm3
3035
iotools.read_psm3
3136
iotools.parse_psm3

docs/sphinx/source/reference/pv_modeling/parameters.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Functions for fitting single diode models
1212
ivtools.sdm.fit_cec_sam
1313
ivtools.sdm.fit_desoto
1414
ivtools.sdm.fit_pvsyst_sandia
15+
ivtools.sdm.fit_pvsyst_iec61853_sandia_2025
1516
ivtools.sdm.fit_desoto_sandia
1617

1718
Functions for fitting the single diode equation
File renamed without changes.
File renamed without changes.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ Follow these steps to obtain the library using git/GitHub:
133133
This button is circled in the image below. Remember the system path that
134134
you clone the library to.
135135

136-
.. image:: ../_images/clonebutton.png
136+
.. image:: ../../_images/clonebutton.png
137137

138138
Please see GitHub's
139139
`Forking Projects <https://guides.github.com/activities/forking/>`_,
File renamed without changes.
File renamed without changes.

docs/sphinx/source/user_guide/index.rst

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@ This user guide is an overview and explains some of the key features of pvlib.
99
.. toctree::
1010
:caption: Getting started
1111
:maxdepth: 2
12-
13-
package_overview
14-
installation
15-
introtutorial
16-
12+
13+
getting_started/package_overview
14+
getting_started/installation
15+
getting_started/introtutorial
16+
1717
.. toctree::
18-
:caption: Modeling topics
1918
:maxdepth: 2
20-
21-
pvsystem
22-
modelchain
23-
timetimezones
24-
bifacial
25-
clearsky
26-
weather_data
27-
singlediode
19+
:caption: Modeling topics
20+
21+
modeling_topics/pvsystem
22+
modeling_topics/modelchain
23+
modeling_topics/timetimezones
24+
modeling_topics/bifacial
25+
modeling_topics/clearsky
26+
modeling_topics/weather_data
27+
modeling_topics/singlediode
2828

2929
.. toctree::
30-
:caption: Extras
3130
:maxdepth: 2
31+
:caption: Extras
3232

33-
nomenclature
34-
faq
33+
extras/nomenclature
34+
extras/faq

docs/sphinx/source/user_guide/bifacial.rst renamed to docs/sphinx/source/user_guide/modeling_topics/bifacial.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ The model operates in the following steps:
8080
determines the fraction of ground-reflected irradiance that reaches the row
8181
surface.
8282
4. Find the fraction of the row surface that is shaded from direct irradiance.
83-
Only sky and ground-reflected irradiance reach the the shaded fraction of
83+
Only sky and ground-reflected irradiance reach the shaded fraction of
8484
the row surface.
8585
5. For the front and rear surfaces, apply the incidence angle modifier to
8686
the direct irradiance and sum the diffuse sky, diffuse ground, and direct

0 commit comments

Comments
 (0)