Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions docs/sphinx/source/whatsnew/v0.16.2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ Deprecations

Bug fixes
~~~~~~~~~
* Correct the Series name in ``ModelChain.results.dc_ohmic_losses`` from
``i_mp`` to ``p_dc_ohmic_loss`` when using ``dc_ohms_from_percent``.
(:issue:`1959`, :pull:`2912`)
* :py:func:`pvlib.tracking.calc_surface_orientation` returns scalar when input
is scalar (:issue:`2881`, :pull:`2882`)

Expand Down Expand Up @@ -62,6 +65,7 @@ Contributors
* Chen Yi (:ghuser:`chenyi6758-source`)
* Rajiv Daxini (:ghuser:`rdaxini`)
* jason-writer (:ghuser:`jason-writer`)
* :ghuser:`xiajiahang`



5 changes: 3 additions & 2 deletions pvlib/modelchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -1008,7 +1008,8 @@ def dc_ohms_from_percent(self):
if isinstance(self.results.dc, tuple):
Rw = self.system.dc_ohms_from_percent(unwrap=False)
self.results.dc_ohmic_losses = tuple(
pvsystem.dc_ohmic_losses(Rw, df['i_mp'])
pvsystem.dc_ohmic_losses(Rw, df['i_mp']).rename(
'p_dc_ohmic_loss')
for Rw, df in zip(Rw, self.results.dc)
)
for df, loss in zip(self.results.dc, self.results.dc_ohmic_losses):
Expand All @@ -1017,7 +1018,7 @@ def dc_ohms_from_percent(self):
Rw = self.system.dc_ohms_from_percent()
self.results.dc_ohmic_losses = pvsystem.dc_ohmic_losses(
Rw, self.results.dc['i_mp']
)
).rename('p_dc_ohmic_loss')
self.results.dc['p_mp'] = (self.results.dc['p_mp']
- self.results.dc_ohmic_losses)
return self
Expand Down
5 changes: 5 additions & 0 deletions tests/test_modelchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -1623,6 +1623,7 @@ def test_dc_ohmic_model_ohms_from_percent(cec_dc_snl_ac_system,
assert m.call_count == 1

assert isinstance(mc.results.dc_ohmic_losses, pd.Series)
assert mc.results.dc_ohmic_losses.name == 'p_dc_ohmic_loss'

system = cec_dc_snl_ac_arrays

Expand All @@ -1639,6 +1640,8 @@ def test_dc_ohmic_model_ohms_from_percent(cec_dc_snl_ac_system,
assert len(mc.results.dc_ohmic_losses) == len(mc.system.arrays)

assert isinstance(mc.results.dc_ohmic_losses, tuple)
for loss in mc.results.dc_ohmic_losses:
assert loss.name == 'p_dc_ohmic_loss'


@pytest.mark.parametrize("input_type", [tuple, list])
Expand All @@ -1660,6 +1663,8 @@ def test_dc_ohmic_model_ohms_from_percent_single_array_list_input(
mc.run_model_from_effective_irradiance(input_type((data,)))

assert isinstance(mc.results.dc_ohmic_losses, tuple)
for loss in mc.results.dc_ohmic_losses:
assert loss.name == 'p_dc_ohmic_loss'
assert len(mc.results.dc_ohmic_losses) == 1


Expand Down
Loading