-
Notifications
You must be signed in to change notification settings - Fork 1.1k
add marion's adjustment to pvwatts_dc #2569
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.
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
base: main
Are you sure you want to change the base?
Changes from 12 commits
05f5408
6d7ae12
40328c8
a9dfb28
551e722
73e80d3
f25b426
380bb58
5d31dfd
ad146b5
69ce5e7
dc58507
0d8b0b5
90b7c54
1297448
4488e3c
250af5a
bd16ac2
f3041c2
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2878,19 +2878,10 @@ | |
|
||
@renamed_kwarg_warning( | ||
"0.13.0", "g_poa_effective", "effective_irradiance") | ||
def pvwatts_dc(effective_irradiance, temp_cell, pdc0, gamma_pdc, temp_ref=25.): | ||
def pvwatts_dc(effective_irradiance, temp_cell, pdc0, gamma_pdc, temp_ref=25., | ||
k=None, cap_adjustment=False): | ||
r""" | ||
Implements NREL's PVWatts DC power model. The PVWatts DC model [1]_ is: | ||
.. math:: | ||
P_{dc} = \frac{G_{poa eff}}{1000} P_{dc0} ( 1 + \gamma_{pdc} (T_{cell} - T_{ref})) | ||
Note that ``pdc0`` is also used as a symbol in | ||
:py:func:`pvlib.inverter.pvwatts`. ``pdc0`` in this function refers to the DC | ||
power of the modules at reference conditions. ``pdc0`` in | ||
:py:func:`pvlib.inverter.pvwatts` refers to the DC power input limit of | ||
the inverter. | ||
Implement NREL's PVWatts (Version 5) DC power model. | ||
Parameters | ||
---------- | ||
|
@@ -2909,22 +2900,81 @@ | |
temp_ref: numeric, default 25.0 | ||
Cell reference temperature. PVWatts defines it to be 25 C and | ||
is included here for flexibility. [C] | ||
k: numeric, optional | ||
Irradiance correction factor, defined in [2]_. [unitless] | ||
cap_adjustment: Boolean, default False | ||
If True, apply the optional adjustment at and below 1000 W/m^2. | ||
Returns | ||
------- | ||
pdc: numeric | ||
DC power. [W] | ||
Notes | ||
----- | ||
The PVWatts Version 5 DC model [1]_ is: | ||
.. math:: | ||
P_{dc} = \frac{G_{poa eff}}{1000} P_{dc0} ( 1 + \gamma_{pdc} (T_{cell} - T_{ref})) | ||
This model has also been referred to as the power temperature coefficient | ||
model. | ||
This function accepts an optional irradiance adjustment factor, `k`, based | ||
on [2]_. This applies a piece-wise adjustment to power based on irradiance, | ||
where `k` is the reduction in actual power at 200 Wm⁻² relative to power | ||
calculated at 200 Wm-2 as 0.2*`pdc0`. For example, a 500 W module that | ||
produces 95 W at 200 Wm-2 (a 5% relative reduction in efficiency) would | ||
have a value of `k` = 0.01. | ||
.. math:: | ||
k=\frac{0.2P_{dc0}-P_{200}}{P_{dc0}} | ||
This adjustment increases relative efficiency for irradiance above 1000 | ||
Wm⁻², which may not be desired. An optional input, `capped_adjustment`, | ||
modifies the adjustment from [2]_ to only apply below 1000 Wm⁻². | ||
Note that ``pdc0`` is also used as a symbol in | ||
:py:func:`pvlib.inverter.pvwatts`. ``pdc0`` in this function refers to the DC | ||
power of the modules at reference conditions. ``pdc0`` in | ||
:py:func:`pvlib.inverter.pvwatts` refers to the DC power input limit of | ||
the inverter. | ||
References | ||
---------- | ||
.. [1] A. P. Dobos, "PVWatts Version 5 Manual" | ||
http://pvwatts.nrel.gov/downloads/pvwattsv5.pdf | ||
(2014). | ||
.. [2] B. Marion, "Comparison of Predictive Models for | ||
Photovoltaic Module Performance," | ||
:doi:`10.1109/PVSC.2008.4922586`, | ||
https://docs.nrel.gov/docs/fy08osti/42511.pdf | ||
(2008). | ||
""" # noqa: E501 | ||
|
||
pdc = (effective_irradiance * 0.001 * pdc0 * | ||
(1 + gamma_pdc * (temp_cell - temp_ref))) | ||
|
||
# apply Marion's correction if k is anything but zero | ||
if k is not None: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. needing to use the |
||
err_1 = (k * (1 - (1 - effective_irradiance / 200)**4) / | ||
(effective_irradiance / 1000)) | ||
err_2 = (k * (1000 - effective_irradiance) / (1000 - 200)) | ||
|
||
pdc_marion = np.where(effective_irradiance <= 200, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. np.where will break the paradigm of "return the same object type that was input" since it always returns an array. Options:
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I see what you mean. I tried a few things, but can’t seem to figure out how to get your proposed solutions to work. Any pointers or examples? |
||
pdc * (1 - err_1), | ||
pdc * (1 - err_2)) | ||
|
||
# "cap" Marion's correction at 1000 W/m^2 | ||
if cap_adjustment is True: | ||
williamhobbs marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
pdc_marion = np.where(effective_irradiance >= 1000, | ||
pdc, | ||
pdc_marion) | ||
|
||
pdc = pdc_marion | ||
|
||
Comment on lines
2964
to
2984
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @williamhobbs have you started / do you intend to write tests? The codecov check fails since this section is not covered by tests. Happy to help with that if you need. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Haven't started, but figured I would need to. Do you have suggestions on tests to add? I have pretty limited experience with the pvlib testing structure/best practices. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'd hand-calculate half a dozen points, using There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Be creative, test whatever comes to mind! Generally speaking, test a range of intended and extreme conditions. Intended: Extreme: Someone else might be able to offer a clearer/more succinct explanation 😅 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Good point, check whether different data types are handled appropriately too There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @williamhobbs you do not have to test with There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Correct, my bad. I was trying to make a general point but overlooked that in the example.
Add to test_pvsystem.py (examples also visible there) |
||
return pdc | ||
|
||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
any concerns about deviating from a reference here? I'm ok with it but imagine it could be a point of contention. perhaps some more documentation clarity would help
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I also wondered about deviating from the reference. It just gives the option to apply the Marion 2008 correction up to 1000 Wm-2, and stay with standard pvwatts above that, so seems like a minor deviation.
And I can definitely add more documentation. I tend to get to long-winded and was trying to fight that. I’m open to suggestions, but will also work on some additions.