@@ -453,11 +453,11 @@ def sapm(self):
453
453
454
454
return self
455
455
456
- def desoto (self ):
456
+ def _singlediode (self , calcparams_model_function ):
457
457
(photocurrent , saturation_current , resistance_series ,
458
458
resistance_shunt , nNsVth ) = (
459
- self . system . calcparams_desoto (self .effective_irradiance ,
460
- self .cell_temperature ))
459
+ calcparams_model_function (self .effective_irradiance ,
460
+ self .temps [ 'temp_cell' ] ))
461
461
462
462
self .diode_params = (photocurrent , saturation_current ,
463
463
resistance_series ,
@@ -471,41 +471,14 @@ def desoto(self):
471
471
472
472
return self
473
473
474
- def cec (self ):
475
- (photocurrent , saturation_current , resistance_series ,
476
- resistance_shunt , nNsVth ) = (
477
- self .system .calcparams_cec (self .effective_irradiance ,
478
- self .cell_temperature ))
479
-
480
- self .diode_params = (photocurrent , saturation_current ,
481
- resistance_series ,
482
- resistance_shunt , nNsVth )
483
-
484
- self .dc = self .system .singlediode (
485
- photocurrent , saturation_current , resistance_series ,
486
- resistance_shunt , nNsVth )
487
-
488
- self .dc = self .system .scale_voltage_current_power (self .dc ).fillna (0 )
474
+ def desoto (self ):
475
+ return self ._singlediode (self .system .calcparams_desoto )
489
476
490
- return self
477
+ def cec (self ):
478
+ return self ._singlediode (self .system .calcparams_cec )
491
479
492
480
def pvsyst (self ):
493
- (photocurrent , saturation_current , resistance_series ,
494
- resistance_shunt , nNsVth ) = (
495
- self .system .calcparams_pvsyst (self .effective_irradiance ,
496
- self .cell_temperature ))
497
-
498
- self .diode_params = (photocurrent , saturation_current ,
499
- resistance_series ,
500
- resistance_shunt , nNsVth )
501
-
502
- self .dc = self .system .singlediode (
503
- photocurrent , saturation_current , resistance_series ,
504
- resistance_shunt , nNsVth )
505
-
506
- self .dc = self .system .scale_voltage_current_power (self .dc ).fillna (0 )
507
-
508
- return self
481
+ return self ._singlediode (self .system .calcparams_pvsyst )
509
482
510
483
def singlediode (self ):
511
484
"""Deprecated"""
0 commit comments