Skip to content

Commit 380bb58

Browse files
committed
more suggested changes
1 parent f25b426 commit 380bb58

1 file changed

Lines changed: 7 additions & 8 deletions

File tree

pvlib/pvsystem.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2879,7 +2879,7 @@ def scale_voltage_current_power(data, voltage=1, current=1):
28792879
@renamed_kwarg_warning(
28802880
"0.13.0", "g_poa_effective", "effective_irradiance")
28812881
def pvwatts_dc(effective_irradiance, temp_cell, pdc0, gamma_pdc, temp_ref=25.,
2882-
k=0.0, capped_adjustment=False):
2882+
k=None, cap_adjustment=False):
28832883
r"""
28842884
Implements NREL's PVWatts (Version 5) DC power model. The PVWatts Version
28852885
5 DC model [1]_ is:
@@ -2892,17 +2892,16 @@ def pvwatts_dc(effective_irradiance, temp_cell, pdc0, gamma_pdc, temp_ref=25.,
28922892
model.
28932893
28942894
This function accepts an optional irradiance adjustment factor, `k`, based
2895-
on based on [2]_. This applies a piece-wise adjustment to power based on
2896-
irradiance, where `k` is the reduction in actual power at 200 W/m^2
2897-
relative to power calculated at 200 W/m^2 as 0.2*`pdc0`.
2895+
on [2]_. This applies a piece-wise adjustment to power based on irradiance,
2896+
where `k` is the reduction in actual power at 200 W/m^2 relative to power
2897+
calculated at 200 W/m^2 as 0.2*`pdc0`. For example, a 500 W module that
2898+
produces 95 W at 200 W/m^2 (a 5% relative reduction in efficiency) would
2899+
have a value of `k` = 0.01.
28982900
28992901
.. math::
29002902
29012903
k=\frac{0.2P_{dc0}-P_{200}}{P_{dc0}}
29022904
2903-
For example, a 500 W module that produces 95 W at 200 W/m^2 (a 5% relative
2904-
reduction in efficiency) would have a value of `k` = 0.01.
2905-
29062905
This adjustment increases relative efficiency for irradiance above 1000
29072906
W/m^2, which may not be desired. An optional input, `capped_adjustment`,
29082907
modifies the adjustment from [2]_ to only apply below 1000 W/m^2.
@@ -2966,7 +2965,7 @@ def pvwatts_dc(effective_irradiance, temp_cell, pdc0, gamma_pdc, temp_ref=25.,
29662965
pdc * (1 - err_2))
29672966

29682967
# "cap" Marion's correction at 1000 W/m^2
2969-
if capped_adjustment is True:
2968+
if cap_adjustment is True:
29702969
pdc_marion = np.where(effective_irradiance >= 1000,
29712970
pdc,
29722971
pdc_marion)

0 commit comments

Comments
 (0)