Skip to content

correct keys for FS modules in spectrum.spectral_factor_pvspec #2400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 26, 2025
Merged

correct keys for FS modules in spectrum.spectral_factor_pvspec #2400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2cf6ae8
correct keys
RDaxini Feb 25, 2025
c62a4ec
Update v0.11.3.rst
RDaxini Feb 25, 2025
fbcc3b1
Update test_mismatch.py
RDaxini Feb 25, 2025
e0bce5a
add "series" to module description
RDaxini Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/sphinx/source/whatsnew/v0.11.3.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Enhancements
ground irradiance when the sun was below the horizon. (:issue:`2245`, :pull:`2359`)
* Fix a bug where :py:func:`pvlib.transformer.simple_efficiency` could only be imported
using the `from pvlib.transformer` syntax (:pull:`2388`)
* Correct keys for First Solar modules in `~pvlib.spectrum.spectral_factor_pvspec` (:issue:`2398`, :pull:`2400`)

Documentation
~~~~~~~~~~~~~
Expand Down
6 changes: 3 additions & 3 deletions pvlib/spectrum/mismatch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ def spectral_factor_pvspec(airmass_absolute, clearsky_index,
One of the following PV technology strings from [1]_:

* ``'fs4-1'`` - First Solar series 4-1 and earlier CdTe module.
* ``'fs4-2'`` - First Solar 4-2 and later CdTe module.
* ``'fs4-2'`` - First Solar series 4-2 and later CdTe module.
* ``'monosi'`` - anonymous monocrystalline Si module.
* ``'multisi'`` - anonymous multicrystalline Si module.
* ``'cigs'`` - anonymous copper indium gallium selenide module.
Expand Down Expand Up @@ -576,8 +576,8 @@ def spectral_factor_pvspec(airmass_absolute, clearsky_index,
_coefficients = {}
_coefficients['multisi'] = (0.9847, -0.05237, 0.03034)
_coefficients['monosi'] = (0.9845, -0.05169, 0.03034)
_coefficients['fs-2'] = (1.002, -0.07108, 0.02465)
_coefficients['fs-4'] = (0.9981, -0.05776, 0.02336)
_coefficients['fs4-2'] = (1.002, -0.07108, 0.02465)
_coefficients['fs4-1'] = (0.9981, -0.05776, 0.02336)
_coefficients['cigs'] = (0.9791, -0.03904, 0.03096)
_coefficients['asi'] = (1.051, -0.1033, 0.009838)

Expand Down
8 changes: 4 additions & 4 deletions pvlib/tests/spectrum/test_mismatch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,8 @@ def test_spectral_factor_caballero_supplied_ambiguous():

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

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