Skip to content
Merged
Changes from 19 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
05f5408
add marion's adjustment
williamhobbs Oct 7, 2025
6d7ae12
linting
williamhobbs Oct 7, 2025
40328c8
Update pvlib/pvsystem.py
williamhobbs Oct 7, 2025
a9dfb28
Update pvlib/pvsystem.py
williamhobbs Oct 7, 2025
551e722
Update pvlib/pvsystem.py
williamhobbs Oct 7, 2025
73e80d3
Update pvlib/pvsystem.py
williamhobbs Oct 7, 2025
f25b426
Update pvlib/pvsystem.py
williamhobbs Oct 7, 2025
380bb58
more suggested changes
williamhobbs Oct 7, 2025
5d31dfd
Update pvlib/pvsystem.py
williamhobbs Oct 8, 2025
ad146b5
Update pvlib/pvsystem.py
williamhobbs Oct 8, 2025
69ce5e7
Update pvlib/pvsystem.py
williamhobbs Oct 8, 2025
dc58507
cleaning up docs
williamhobbs Oct 8, 2025
0d8b0b5
Update pvlib/pvsystem.py
williamhobbs Oct 8, 2025
90b7c54
prevent negative power
williamhobbs Oct 9, 2025
1297448
Merge branch 'add_marion' of https://github.com/williamhobbs/pvlib-py…
williamhobbs Oct 9, 2025
4488e3c
fix typo in error eqn
williamhobbs Oct 9, 2025
250af5a
fix the right typo this time...
williamhobbs Oct 9, 2025
bd16ac2
reorder err eqns
williamhobbs Oct 9, 2025
f3041c2
add more detail on `cap_adjustment`
williamhobbs Oct 9, 2025
9f756bf
return same object type that was input
williamhobbs Oct 16, 2025
17f7213
fix issue with scalars
williamhobbs Oct 16, 2025
a018525
another fix
williamhobbs Oct 16, 2025
816c82a
add tests
williamhobbs Oct 16, 2025
a19b721
increase test coverage
williamhobbs Oct 17, 2025
85016fa
more test coverage
williamhobbs Oct 17, 2025
bed78f9
fix shallow copy issue
williamhobbs Oct 17, 2025
c8b5cde
Update pvlib/pvsystem.py
williamhobbs Oct 17, 2025
1f85ed2
Update pvlib/pvsystem.py
williamhobbs Oct 17, 2025
e81b450
Update pvlib/pvsystem.py
williamhobbs Oct 17, 2025
3ea68ef
update whatsnew
williamhobbs Oct 17, 2025
86ccbb1
Merge branch 'add_marion' of https://github.com/williamhobbs/pvlib-py…
williamhobbs Oct 17, 2025
158ff41
reorganize to clean it up
williamhobbs Oct 17, 2025
1e3d413
single comp path on numpy array
williamhobbs Oct 17, 2025
bdf331d
added some comments
williamhobbs Oct 17, 2025
4c3e01d
unit formatting
williamhobbs Oct 17, 2025
996092a
call keyword arguments as keyword arguments
williamhobbs Oct 20, 2025
5777613
quick fix
williamhobbs Oct 20, 2025
3c7f1e9
a few more missed keyword args
williamhobbs Oct 20, 2025
86eb06e
simplify with_k_and_cap_adjustmen
williamhobbs Oct 20, 2025
4650443
Update pvlib/pvsystem.py
williamhobbs Oct 21, 2025
c646f21
Update pvlib/pvsystem.py
williamhobbs Oct 21, 2025
f3e165e
Update pvlib/pvsystem.py
williamhobbs Oct 21, 2025
6624239
doc formatting/linting
williamhobbs Oct 21, 2025
f7904de
Merge branch 'main' into add_marion
cwhanse Nov 7, 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
81 changes: 69 additions & 12 deletions pvlib/pvsystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Check failure on line 2884 in pvlib/pvsystem.py

View workflow job for this annotation

GitHub Actions / flake8-linter

W291 trailing whitespace

Parameters
----------
Expand All @@ -2909,22 +2900,88 @@
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]_. Typically positive.
[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}}

For positive `k` values, and `k` is typically positive, this adjustment
increases relative efficiency when irradiance is above 1000 Wm⁻². This may
not be desired, as modules with nonlinear irradiance response often have
peak efficiency near 1000 Wm⁻², and it is either flat or declining at
higher irradiance. An optional parameter, `cap_adjustment`, can address
this by modifying 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:
err_1 = k * (1 - (1 - effective_irradiance / 200)**4)
err_2 = k * (1000 - effective_irradiance) / (1000 - 200)

pdc_marion = np.where(effective_irradiance <= 200,
pdc - (pdc0 * err_1),
pdc - (pdc0 * err_2))

# "cap" Marion's correction at 1000 W/m^2
if cap_adjustment:
pdc_marion = np.where(effective_irradiance >= 1000,
pdc,
pdc_marion)

# large k values can result in negative power at low irradiance, so
# set negative power to zero
pdc_marion[pdc_marion < 0] = 0

pdc = pdc_marion

return pdc


Expand Down
Loading