call prepare_inputs from run_model

Author: wholmgren

pvlib/modelchain.py

@@ -280,7 +280,8 @@ def orientation_strategy(self, strategy):
 
     def prepare_inputs(self, times, irradiance=None, weather=None):
         """
-        Run the model.
+        Prepare the solar position, irradiance, and weather inputs to
+        the model.
 
         Parameters
         ----------
@@ -339,6 +340,7 @@ def run_model(self):
         """
         A stub function meant to be subclassed.
         """
+
         raise NotImplementedError(
             'you must subclass ModelChain and implement this method')
 
@@ -347,20 +349,31 @@ class SAPM(ModelChain):
     """
     Uses the SAPM to calculate cell temperature, DC power and AC power.
     """
-    def run_model(self):
+    def run_model(self, times, irradiance=None, weather=None):
         """
         Run the model.
 
         Parameters
         ----------
+        times : DatetimeIndex
+            Times at which to evaluate the model.
+
+        irradiance : None or DataFrame
+            If None, calculates clear sky data.
+            Columns must be 'dni', 'ghi', 'dhi'.
+
+        weather : None or DataFrame
+            If None, assumes air temperature is 20 C and
+            wind speed is 0 m/s.
+            Columns must be 'wind_speed', 'temp_air'.
 
         Returns
         -------
         self
 
         Assigns attributes: temps, dc, ac
         """
-
+        self.prepare_inputs(times, irradiance, weather)
 
         self.temps = self.system.sapm_celltemp(self.total_irrad['poa_global'],
                                                self.weather['wind_speed'],
@@ -383,12 +396,23 @@ class SingleDiode(ModelChain):
     and the SAPM models to calculate cell temperature and AC power.
     """
 
-    def run_model(self):
+    def run_model(self, times, irradiance=None, weather=None):
         """
         Run the model.
 
         Parameters
         ----------
+        times : DatetimeIndex
+            Times at which to evaluate the model.
+
+        irradiance : None or DataFrame
+            If None, calculates clear sky data.
+            Columns must be 'dni', 'ghi', 'dhi'.
+
+        weather : None or DataFrame
+            If None, assumes air temperature is 20 C and
+            wind speed is 0 m/s.
+            Columns must be 'wind_speed', 'temp_air'.
 
         Returns
         -------
@@ -397,6 +421,7 @@ def run_model(self):
         Assigns attributes: temps, dc, ac
         """
 
+        self.prepare_inputs(times, irradiance, weather)
 
         self.temps = self.system.sapm_celltemp(self.total_irrad['poa_global'],
                                                self.weather['wind_speed'],