Merge pull request #562 from NREL/develop

master < develop

CHANGELOG.md

@@ -26,7 +26,14 @@ Classify the change according to the following categories:
     ##### Removed
     ### Patches
 
-
+## v3.4.1
+### Minor Updates
+#### Fixed
+- Fixed Wind validation code to prevent erroring when user provides `production_factor_series` for location outside of WindToolkit bounds. 
+- Fixed divide by zero error when POSTing to the `/erp` endpoint with a `battery_size_kw` of 0
+#### Changed
+- Updated `reopt_version` in `ERPJob` to 0.39.1
+
 ## v3.4.0
 ### Minor Updates
 #### Added 

reoptjl/validators.py

@@ -288,7 +288,7 @@ def update_pv_defaults_offgrid(self, pvmodel):
                 for time_series in ["production_factor_series"] + wind_resource_inputs:
                     self.clean_time_series("Wind", time_series)
 
-                if not all([self.models["Wind"].__getattribute__(wr) for wr in wind_resource_inputs]):
+                if not all([self.models["Wind"].__getattribute__(wr) for wr in wind_resource_inputs]) and not self.models["Wind"].__getattribute__("production_factor_series"):
                     # then no wind_resource_inputs provided, so we need to get the resource from WindToolkit
                     if not lat_lon_in_windtoolkit(self.models["Site"].__getattribute__("latitude"),
                                                   self.models["Site"].__getattribute__("longitude")):
@@ -663,5 +663,5 @@ def lat_lon_in_windtoolkit(lat, lon):
     y = int(round((point[1] - origin[1]) / 2000))
     y_max, x_max = (1602, 2976)
     if (x < 0) or (y < 0) or (x >= x_max) or (y >= y_max):
-        raise ValueError("Latitude/Longitude is outside of wind resource dataset bounds.")
+        return None
     return y, x

resilience_stats/api.py

@@ -62,7 +62,7 @@ def obj_create(self, bundle, **kwargs):
 
         meta_dict = {
             "run_uuid": erp_run_uuid,
-            "reopt_version": "0.30.0",
+            "reopt_version": "0.39.1",
             "status": "Validating..."
         }
 

resilience_stats/models.py

@@ -423,7 +423,10 @@ class ERPElectricStorageInputs(BaseModel, models.Model):
 
     def clean(self):
         if self.num_battery_bins is None:
-            self.num_battery_bins = round(20 * self.size_kwh / self.size_kw)
+            if self.size_kw == 0:
+                self.num_battery_bins = 1
+            else:
+                self.num_battery_bins = round(20 * self.size_kwh / self.size_kw)
 
 
 class ERPPVInputs(BaseModel, models.Model):

resilience_stats/tests/test_erp.py

@@ -47,7 +47,7 @@ def get_chp_defaults(self, prime_mover, is_chp, size_kw):
             self.reopt_base_erp_chp_defaults.format(prime_mover, is_chp, size_kw),
             format='json'
         )
-
+        
     def test_erp_long_duration_battery(self):
         post_opt = json.load(open(self.post_opt_long_dur_stor, 'rb'))
         resp = self.get_response_opt(post_opt)
@@ -171,7 +171,17 @@ def test_erp_with_no_opt(self):
         results = json.loads(resp.content)
 
         self.assertAlmostEqual(results["outputs"]["mean_cumulative_survival_final_time_step"], 0.904242, places=4) #0.990784, places=4)
-
+
+        # Test that zero battery doesn't cause error
+        post_sim["ElectricStorage"]["size_kwh"] = 0
+        post_sim["ElectricStorage"]["size_kwh"] = 0
+        resp = self.get_response_sim(post_sim)
+        self.assertHttpCreated(resp)
+        r_sim = json.loads(resp.content)
+        erp_run_uuid = r_sim.get('run_uuid')
+        resp = self.get_results_sim(erp_run_uuid)
+        self.assertHttpOK(resp)
+
     def test_erp_help_view(self):
         """
         Tests hiting the erp/help url to get defaults and other info about inputs