@@ -992,12 +992,10 @@ def _set_celltemp(self, model):
992992
993993 Parameters
994994 ----------
995- model : function
996- A function that takes POA irradiance, air temperature, and
997- wind speed and returns cell temperature. `model` must accept
998- tuples or single values for each parameter where each element of
999- the tuple is the value for a different array in the system
1000- (see :py:class:`pvlib.pvsystem.PVSystem` for more information).
995+ model : str
996+ A cell temperature model name to pass to
997+ :py:meth:`pvlib.pvsystem.PVSystem.get_cell_temperature`.
998+ Valid names are 'sapm', 'pvsyst', 'faiman', 'fuentes', 'noct_sam'
1001999
10021000 Returns
10031001 -------
@@ -1009,26 +1007,26 @@ def _set_celltemp(self, model):
10091007 temp_air = _tuple_from_dfs (self .results .weather , 'temp_air' )
10101008 wind_speed = _tuple_from_dfs (self .results .weather , 'wind_speed' )
10111009 kwargs = {}
1012- if model == self . system . noct_sam_celltemp :
1010+ if model == 'noct_sam' :
10131011 kwargs ['effective_irradiance' ] = self .results .effective_irradiance
1014- self .results .cell_temperature = model ( poa , temp_air , wind_speed ,
1015- ** kwargs )
1012+ self .results .cell_temperature = self . system . get_cell_temperature (
1013+ poa , temp_air , wind_speed , model = model , ** kwargs )
10161014 return self
10171015
10181016 def sapm_temp (self ):
1019- return self ._set_celltemp (self . system . sapm_celltemp )
1017+ return self ._set_celltemp ('sapm' )
10201018
10211019 def pvsyst_temp (self ):
1022- return self ._set_celltemp (self . system . pvsyst_celltemp )
1020+ return self ._set_celltemp ('pvsyst' )
10231021
10241022 def faiman_temp (self ):
1025- return self ._set_celltemp (self . system . faiman_celltemp )
1023+ return self ._set_celltemp ('faiman' )
10261024
10271025 def fuentes_temp (self ):
1028- return self ._set_celltemp (self . system . fuentes_celltemp )
1026+ return self ._set_celltemp ('fuentes' )
10291027
10301028 def noct_sam_temp (self ):
1031- return self ._set_celltemp (self . system . noct_sam_celltemp )
1029+ return self ._set_celltemp ('noct_sam' )
10321030
10331031 @property
10341032 def dc_ohmic_model (self ):
0 commit comments