Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 5c86e8c

Browse filesBrowse files
authored
correct keys for FS modules in spectrum.spectral_factor_pvspec (#2400)
* correct keys * Update v0.11.3.rst * Update test_mismatch.py * add "series" to module description
1 parent 171f10c commit 5c86e8c
Copy full SHA for 5c86e8c

File tree

Expand file treeCollapse file tree

3 files changed

+8
-7
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+8
-7
lines changed

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

Copy file name to clipboardExpand all lines: docs/sphinx/source/whatsnew/v0.11.3.rst
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Enhancements
1616
ground irradiance when the sun was below the horizon. (:issue:`2245`, :pull:`2359`)
1717
* Fix a bug where :py:func:`pvlib.transformer.simple_efficiency` could only be imported
1818
using the `from pvlib.transformer` syntax (:pull:`2388`)
19+
* Correct keys for First Solar modules in `~pvlib.spectrum.spectral_factor_pvspec` (:issue:`2398`, :pull:`2400`)
1920

2021
Documentation
2122
~~~~~~~~~~~~~

‎pvlib/spectrum/mismatch.py

Copy file name to clipboardExpand all lines: pvlib/spectrum/mismatch.py
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ def spectral_factor_pvspec(airmass_absolute, clearsky_index,
520520
One of the following PV technology strings from [1]_:
521521
522522
* ``'fs4-1'`` - First Solar series 4-1 and earlier CdTe module.
523-
* ``'fs4-2'`` - First Solar 4-2 and later CdTe module.
523+
* ``'fs4-2'`` - First Solar series 4-2 and later CdTe module.
524524
* ``'monosi'`` - anonymous monocrystalline Si module.
525525
* ``'multisi'`` - anonymous multicrystalline Si module.
526526
* ``'cigs'`` - anonymous copper indium gallium selenide module.
@@ -576,8 +576,8 @@ def spectral_factor_pvspec(airmass_absolute, clearsky_index,
576576
_coefficients = {}
577577
_coefficients['multisi'] = (0.9847, -0.05237, 0.03034)
578578
_coefficients['monosi'] = (0.9845, -0.05169, 0.03034)
579-
_coefficients['fs-2'] = (1.002, -0.07108, 0.02465)
580-
_coefficients['fs-4'] = (0.9981, -0.05776, 0.02336)
579+
_coefficients['fs4-2'] = (1.002, -0.07108, 0.02465)
580+
_coefficients['fs4-1'] = (0.9981, -0.05776, 0.02336)
581581
_coefficients['cigs'] = (0.9791, -0.03904, 0.03096)
582582
_coefficients['asi'] = (1.051, -0.1033, 0.009838)
583583

‎pvlib/tests/spectrum/test_mismatch.py

Copy file name to clipboardExpand all lines: pvlib/tests/spectrum/test_mismatch.py
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,8 @@ def test_spectral_factor_caballero_supplied_ambiguous():
202202

203203
@pytest.mark.parametrize("module_type,expected", [
204204
('asi', np.array([1.15534029, 1.1123772, 1.08286684, 1.01915462])),
205-
('fs-2', np.array([1.0694323, 1.04948777, 1.03556288, 0.9881471])),
206-
('fs-4', np.array([1.05234725, 1.037771, 1.0275516, 0.98820533])),
205+
('fs4-2', np.array([1.0694323, 1.04948777, 1.03556288, 0.9881471])),
206+
('fs4-1', np.array([1.05234725, 1.037771, 1.0275516, 0.98820533])),
207207
('multisi', np.array([1.03310403, 1.02391703, 1.01744833, 0.97947605])),
208208
('monosi', np.array([1.03225083, 1.02335353, 1.01708734, 0.97950110])),
209209
('cigs', np.array([1.01475834, 1.01143927, 1.00909094, 0.97852966])),
@@ -218,8 +218,8 @@ def test_spectral_factor_pvspec(module_type, expected):
218218

219219
@pytest.mark.parametrize("module_type,expected", [
220220
('asi', pd.Series([1.15534029, 1.1123772, 1.08286684, 1.01915462])),
221-
('fs-2', pd.Series([1.0694323, 1.04948777, 1.03556288, 0.9881471])),
222-
('fs-4', pd.Series([1.05234725, 1.037771, 1.0275516, 0.98820533])),
221+
('fs4-2', pd.Series([1.0694323, 1.04948777, 1.03556288, 0.9881471])),
222+
('fs4-1', pd.Series([1.05234725, 1.037771, 1.0275516, 0.98820533])),
223223
('multisi', pd.Series([1.03310403, 1.02391703, 1.01744833, 0.97947605])),
224224
('monosi', pd.Series([1.03225083, 1.02335353, 1.01708734, 0.97950110])),
225225
('cigs', pd.Series([1.01475834, 1.01143927, 1.00909094, 0.97852966])),

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.