Skip to content

Commit d5512f1

Browse files
committed
Merge branch 'main' into move-test-files
2 parents 9c597a9 + 2ca40aa commit d5512f1

File tree

8 files changed

+44
-24
lines changed

8 files changed

+44
-24
lines changed

.github/workflows/asv_check.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,7 @@ jobs:
2626
python-version: '3.9'
2727

2828
- name: Install asv
29-
run: pip install asv==0.4.2
30-
31-
# asv 0.4.2 (and more recent versions as well) creates conda envs
32-
# using the --force option, which was removed in conda 24.3.
33-
# Since ubuntu-latest now comes with conda 24.3 pre-installed,
34-
# using the system's conda will result in error.
35-
# To prevent that, we install an older version.
36-
# TODO: remove this when we eventually upgrade our asv version.
37-
# https://github.com/airspeed-velocity/asv/issues/1396
38-
- name: Install Conda
39-
uses: conda-incubator/setup-miniconda@v3
40-
with:
41-
conda-version: 24.1.2
29+
run: pip install asv==0.6.4
4230

4331
- name: Run asv benchmarks
4432
run: |
Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,34 @@
1+
.. _user_guide:
2+
13
==========
24
User Guide
35
==========
46

7+
This user guide is an overview and explains some of the key features of pvlib.
58

69
.. toctree::
10+
:caption: Getting started
711
:maxdepth: 2
8-
12+
913
package_overview
1014
installation
1115
introtutorial
16+
17+
.. toctree::
18+
:caption: Modeling topics
19+
:maxdepth: 2
20+
1221
pvsystem
1322
modelchain
1423
timetimezones
15-
clearsky
1624
bifacial
25+
clearsky
1726
weather_data
1827
singlediode
28+
29+
.. toctree::
30+
:caption: Extras
31+
:maxdepth: 2
32+
1933
nomenclature
2034
faq

docs/sphinx/source/user_guide/introtutorial.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ to accomplish our system modeling goal:
8787
longitude=longitude,
8888
altitude=altitude,
8989
temperature=weather["temp_air"],
90-
pressure=pvlib.atmosphere.alt2pres(altitude),
90+
pressure=weather["pressure"],
9191
)
9292
dni_extra = pvlib.irradiance.get_extra_radiation(weather.index)
9393
airmass = pvlib.atmosphere.get_relative_airmass(solpos['apparent_zenith'])

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@ Deprecations
1010

1111
Enhancements
1212
~~~~~~~~~~~~
13-
13+
* Fix a bug in :py:func:`pvlib.bifacial.get_irradiance_poa` which may have yielded non-zero
14+
ground irradiance when the sun was below the horizon. (:issue:`2245`, :pull:`2359`)
1415

1516
Documentation
1617
~~~~~~~~~~~~~
17-
18+
* Fix Procedural and Object Oriented simulation examples having slightly different results, in :ref:`introtutorial`. (:issue:`2366`, :pull:`2367`)
19+
* Restructure the user guide with subsections (:issue:`2302`, :pull:`2310`)
1820

1921
Testing
2022
~~~~~~~
@@ -24,7 +26,17 @@ Requirements
2426
~~~~~~~~~~~~
2527

2628

27-
Contributors
28-
~~~~~~~~~~~~
29+
Maintenance
30+
~~~~~~~~~~~
31+
* Fix ReadTheDocs builds by upgrading `readthedocs.yml` configuration
32+
(:issue:`2357`, :pull:`2358`)
33+
* asv 0.4.2 upgraded to asv 0.6.4 to fix CI failure due to pinned older conda.
34+
(:pull:`2352`)
2935

3036

37+
Contributors
38+
~~~~~~~~~~~~
39+
* Rajiv Daxini (:ghuser:`RDaxini`)
40+
* Mark Campanelli (:ghuser:`markcampanelli`)
41+
* Jason Lun Leung (:ghuser:`jason-rpkt`)
42+
* Manoj K S (:ghuser:`manojks1999`)

pvlib/bifacial/infinite_sheds.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,9 @@ def get_irradiance_poa(surface_tilt, surface_azimuth, solar_zenith,
260260
Returns
261261
-------
262262
output : dict or DataFrame
263-
Output is a DataFrame when input ghi is a Series. See Notes for
264-
descriptions of content.
263+
Output is a ``pandas.DataFrame`` when ``ghi`` is a Series.
264+
Otherwise it is a dict of ``numpy.ndarray``
265+
See Notes for descriptions of content.
265266
266267
Notes
267268
-----
@@ -372,7 +373,7 @@ def get_irradiance_poa(surface_tilt, surface_azimuth, solar_zenith,
372373
'poa_global': poa_global, 'poa_direct': poa_direct,
373374
'poa_diffuse': poa_diffuse, 'poa_ground_diffuse': poa_gnd_pv,
374375
'poa_sky_diffuse': poa_sky_pv, 'shaded_fraction': f_x}
375-
if isinstance(poa_global, pd.Series):
376+
if isinstance(ghi, pd.Series):
376377
output = pd.DataFrame(output)
377378
return output
378379

pvlib/bifacial/utils.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ def _unshaded_ground_fraction(surface_tilt, surface_azimuth, solar_zenith,
8787
surface_azimuth)
8888
f_gnd_beam = 1.0 - np.minimum(
8989
1.0, gcr * np.abs(cosd(surface_tilt) + sind(surface_tilt) * tan_phi))
90-
np.where(solar_zenith > max_zenith, 0., f_gnd_beam) # [1], Eq. 4
90+
# [1], Eq. 4
91+
f_gnd_beam = np.where(solar_zenith > max_zenith, 0., f_gnd_beam)
9192
return f_gnd_beam # 1 - min(1, abs()) < 1 always
9293

9394

readthedocs.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
# Required
66
version: 2
77

8+
sphinx:
9+
configuration: docs/sphinx/source/conf.py
10+
811
build:
912
os: ubuntu-lts-latest
1013
tools:

tests/bifacial/test_infinite_sheds.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ def test_get_irradiance_poa():
130130
# series inputs
131131
surface_tilt = pd.Series(surface_tilt)
132132
surface_azimuth = pd.Series(data=surface_azimuth, index=surface_tilt.index)
133+
ghi = pd.Series(data=ghi, index=surface_tilt.index)
133134
solar_zenith = pd.Series(solar_zenith, index=surface_tilt.index)
134135
solar_azimuth = pd.Series(data=solar_azimuth, index=surface_tilt.index)
135136
expected_diffuse = pd.Series(

0 commit comments

Comments
 (0)