Skip to content

Commit f702c73

Browse files
Uwe KrienUwe Krien
Uwe Krien
authored and
Uwe Krien
committed
overwrite self.weather completly with its parameter instead of column-wise
1 parent 6a1a61d commit f702c73

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

pvlib/modelchain.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -686,11 +686,7 @@ def prepare_inputs(self, times=None, irradiance=None, weather=None):
686686
# Add columns that does not exist and overwrite existing columns
687687
# Maybe there is a more elegant way to do this. Any ideas?
688688
if weather is not None:
689-
if self.weather is None:
690-
self.weather = weather
691-
else:
692-
self.weather = self.weather.combine_first(weather)
693-
self.weather.update(weather)
689+
self.weather = weather
694690

695691
# The following part could be removed together with the irradiance
696692
# parameter at version v0.5 or v0.6.

0 commit comments

Comments
 (0)