urbanopt-reopt 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d9d19d477fb4b826e800e1695fac87904b9c9c05e97bc8de90016637475bbe9
-  data.tar.gz: 8a91ed02bc8a97a654aefe3410ef6880e1319c4c6a7180d9a821dae93d2edf3b
+  metadata.gz: 219ca91a5d19e9bb7e556b82795b1c6d8585ff114a315e684d90877a955f0d77
+  data.tar.gz: d3176067f1c7621d242285404274e932ee03cf4cef4520565321f23ca21d866b
 SHA512:
-  metadata.gz: 845d8460f6b22bb4708ad6ee554137529d2664d8845dc597d6844922c95a381205051d3968f4c16333d47e6b132e41060102c372bdea5f5e37836cdd2096ad1a
-  data.tar.gz: 6cf3ed775038051b4029cfd2e2c28b3b76a0bffa50f5f925a613575ccb549278d15065dfa3cfbf94ac0435eaed5b15a2d4b2fdf9e7ca8b4d30b83c4b4e404f92
+  metadata.gz: b535f5094280f785bc86172528931011f1dba89cbc8c5b3673e6452aea093f7add85bf9b2ef94ab8db960d39c26b71c2edd7d0742f8f6ef3c405c24bcb67a745
+  data.tar.gz: 4052393e76b6b15077dc7b24c5654aa7dc74d69482d31fdf472c6a7ddf1c98dd1f9202b17adb3e964879a6c193450bd88843047a557ce936e4c78d1bc2c21dda

data/.rubocop.yml

@@ -3,7 +3,7 @@ AllCops:
     - gems/**/*
     - measures/**/*
     - spec/files/**/measures/**/*
-
+require: rubocop-performance
 
 inherit_from:
-  - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v3.yml
+  - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v4.yml

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # URBANopt REopt Gem
 
+## Version 0.6.1
+
+Date Range: 04/30/21 - 06/30/21:
+* Fixed [#83]( https://github.com/urbanopt/urbanopt-reopt-gem/issues/83 ), reopt rate-limit error is hard to decipher
+* Fixed [#84]( https://github.com/urbanopt/urbanopt-reopt-gem/pull/84 ), Api error codes
+* Fixed [#86]( https://github.com/urbanopt/urbanopt-reopt-gem/pull/86 ), update rubocop configs to v4
+
 ## Version 0.6.0
 Date Range: 4/16/21 - 4/29/21
 

data/Gemfile

@@ -53,4 +53,4 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 #   gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop'
 # end
 
-# gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop'
+# gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop'

data/Rakefile

@@ -61,10 +61,10 @@ task :cli_openssl_test do
 
   puts 'SYSTEM CALL:'
   puts the_call
-  STDOUT.flush
+  $stdout.flush
   result = runner.run_command(the_call)
   puts "DONE, result = #{result}"
-  STDOUT.flush
+  $stdout.flush
 end
 
 task default: :spec

data/lib/urbanopt/reopt/feature_report_adapter.rb

@@ -99,16 +99,12 @@ module URBANopt # :nodoc:
         reopt_inputs[:Scenario][:Site][:longitude] = feature_report.location.longitude_deg
 
         # Parse Optional FeatureReport metrics - do not overwrite from assumptions file
-        if reopt_inputs[:Scenario][:Site][:roof_squarefeet].nil?
-          unless feature_report.program.roof_area_sqft.nil?
-            reopt_inputs[:Scenario][:Site][:roof_squarefeet] = feature_report.program.roof_area_sqft[:available_roof_area_sqft]
-          end
+        if reopt_inputs[:Scenario][:Site][:roof_squarefeet].nil? && !feature_report.program.roof_area_sqft.nil?
+          reopt_inputs[:Scenario][:Site][:roof_squarefeet] = feature_report.program.roof_area_sqft[:available_roof_area_sqft]
         end
 
-        if reopt_inputs[:Scenario][:Site][:land_acres].nil?
-          unless feature_report.program.site_area_sqft.nil?
-            reopt_inputs[:Scenario][:Site][:land_acres] = feature_report.program.site_area_sqft * 1.0 / 43560 # acres/sqft
-          end
+        if reopt_inputs[:Scenario][:Site][:land_acres].nil? && !feature_report.program.site_area_sqft.nil?
+          reopt_inputs[:Scenario][:Site][:land_acres] = feature_report.program.site_area_sqft * 1.0 / 43560 # acres/sqft
         end
 
         if reopt_inputs[:Scenario][:time_steps_per_hour].nil?
@@ -117,23 +113,23 @@ module URBANopt # :nodoc:
 
         # Parse Load Profile
         begin
-          #Convert kWh values in the timeseries CSV to kW
+          # Convert kWh values in the timeseries CSV to kW
           col_num = feature_report.timeseries_csv.column_names.index('Electricity:Facility(kWh)')
           t = CSV.read(feature_report.timeseries_csv.path, headers: true, converters: :numeric)
-          energy_timeseries_kw = t.by_col[col_num].map { |e| ((e * feature_report.timesteps_per_hour || 0) ) }
-          #Fill in missing timestep values with 0 if a full year is not provided
+          energy_timeseries_kw = t.by_col[col_num].map { |e| ((e * feature_report.timesteps_per_hour || 0)) }
+          # Fill in missing timestep values with 0 if a full year is not provided
           if energy_timeseries_kw.length < (feature_report.timesteps_per_hour * 8760)
-            start_date = Time.parse(t.by_col["Datetime"][0])
+            start_date = Time.parse(t.by_col['Datetime'][0])
             start_ts = (((start_date.yday * 60.0 * 60.0 * 24) + (start_date.hour * 60.0 * 60.0) + (start_date.min * 60.0) + start_date.sec) /
-                        (( 60 / feature_report.timesteps_per_hour ) * 60)).to_int
-            end_date = Time.parse(t.by_col["Datetime"][-1])
+                        ((60 / feature_report.timesteps_per_hour) * 60)).to_int
+            end_date = Time.parse(t.by_col['Datetime'][-1])
             end_ts = (((end_date.yday * 60.0 * 60.0 * 24) + (end_date.hour * 60.0 * 60.0) + (end_date.min * 60.0) + end_date.sec) /
-                        (( 60 / feature_report.timesteps_per_hour ) * 60)).to_int
-            energy_timeseries_kw = [0.0]*(start_ts-1) + energy_timeseries_kw + [0.0]*((feature_report.timesteps_per_hour * 8760) - end_ts)
+                        ((60 / feature_report.timesteps_per_hour) * 60)).to_int
+            energy_timeseries_kw = [0.0] * (start_ts - 1) + energy_timeseries_kw + [0.0] * ((feature_report.timesteps_per_hour * 8760) - end_ts)
           end
-          #Clip to one non-leap year's worth of data
-          energy_timeseries_kw = energy_timeseries_kw.map { |e| e ? e : 0 }[0,(feature_report.timesteps_per_hour * 8760)]
-          #Convert from the OpenDSS resolution to the REopt Lite resolution, if necessary
+          # Clip to one non-leap year's worth of data
+          energy_timeseries_kw = energy_timeseries_kw.map { |e| e || 0 }[0, (feature_report.timesteps_per_hour * 8760)]
+          # Convert from the OpenDSS resolution to the REopt Lite resolution, if necessary
         rescue StandardError
           @@logger.error("Could not parse the annual electric load from the timeseries csv - #{feature_report.timeseries_csv.path}")
           raise "Could not parse the annual electric load from the timeseries csv - #{feature_report.timeseries_csv.path}"
@@ -142,8 +138,7 @@ module URBANopt # :nodoc:
         # Convert load to REopt Resolution
         begin
           reopt_inputs[:Scenario][:Site][:LoadProfile][:loads_kw] = convert_powerflow_resolution(energy_timeseries_kw, feature_report.timesteps_per_hour, reopt_inputs[:Scenario][:time_steps_per_hour])
-
-        rescue
+        rescue StandardError
           @@logger.error("Could not convert the annual electric load from a resolution of #{feature_report.timesteps_per_hour} to #{reopt_inputs[:Scenario][:time_steps_per_hour]}")
           raise "Could not convert the annual electric load from a resolution of #{feature_report.timesteps_per_hour} to #{reopt_inputs[:Scenario][:time_steps_per_hour]}"
         end
@@ -151,9 +146,9 @@ module URBANopt # :nodoc:
         if reopt_inputs[:Scenario][:Site][:ElectricTariff][:coincident_peak_load_active_timesteps].nil?
           n_top_values = 100
           tmp1 = reopt_inputs[:Scenario][:Site][:LoadProfile][:loads_kw]
-          tmp2 = tmp1.each_index.max_by(n_top_values*reopt_inputs[:Scenario][:time_steps_per_hour]){|i| tmp1[i]}
+          tmp2 = tmp1.each_index.max_by(n_top_values * reopt_inputs[:Scenario][:time_steps_per_hour]) { |i| tmp1[i] }
           for i in (0...tmp2.count)
-              tmp2[i] += 1
+            tmp2[i] += 1
           end
           reopt_inputs[:Scenario][:Site][:ElectricTariff][:coincident_peak_load_active_timesteps] = tmp2
         end
@@ -165,7 +160,6 @@ module URBANopt # :nodoc:
         return reopt_inputs
       end
 
-
       ##
       # Update a FeatureReport from a \REopt Lite response
       #
@@ -177,7 +171,7 @@ module URBANopt # :nodoc:
       #
       # [*return:*] _URBANopt::Reporting::DefaultReports::FeatureReport_ - Returns an updated FeatureReport.
       ##
-      def update_feature_report(feature_report, reopt_output, timeseries_csv_path=nil, resilience_stats=nil)
+      def update_feature_report(feature_report, reopt_output, timeseries_csv_path = nil, resilience_stats = nil)
         # Check if the \REopt Lite response is valid
         if reopt_output['outputs']['Scenario']['status'] != 'optimal'
           @@logger.info("Warning cannot Feature Report #{feature_report.name} #{feature_report.id}  - REopt optimization was non-optimal")
@@ -210,29 +204,29 @@ module URBANopt # :nodoc:
           feature_report.distributed_generation.probs_of_surviving_by_hour_of_the_day = resilience_stats['probs_of_surviving_by_hour_of_the_day']
         end
 
-        if reopt_output['outputs']['Scenario']['Site']['PV'].class == Hash
+        if reopt_output['outputs']['Scenario']['Site']['PV'].instance_of?(Hash)
           reopt_output['outputs']['Scenario']['Site']['PV'] = [reopt_output['outputs']['Scenario']['Site']['PV']]
         elsif reopt_output['outputs']['Scenario']['Site']['PV'].nil?
           reopt_output['outputs']['Scenario']['Site']['PV'] = []
         end
 
         reopt_output['outputs']['Scenario']['Site']['PV'].each_with_index do |pv, i|
-          feature_report.distributed_generation.add_tech 'solar_pv',  URBANopt::Reporting::DefaultReports::SolarPV.new( {size_kw: (pv['size_kw'] || 0), id: i })
+          feature_report.distributed_generation.add_tech 'solar_pv', URBANopt::Reporting::DefaultReports::SolarPV.new({ size_kw: (pv['size_kw'] || 0), id: i })
         end
 
         wind = reopt_output['outputs']['Scenario']['Site']['Wind']
-        if !wind['size_kw'].nil? and wind['size_kw'] != 0
-          feature_report.distributed_generation.add_tech 'wind',  URBANopt::Reporting::DefaultReports::Wind.new( {size_kw: (wind['size_kw'] || 0) })
+        if !wind['size_kw'].nil? && (wind['size_kw'] != 0)
+          feature_report.distributed_generation.add_tech 'wind', URBANopt::Reporting::DefaultReports::Wind.new({ size_kw: (wind['size_kw'] || 0) })
         end
 
         generator = reopt_output['outputs']['Scenario']['Site']['Generator']
-        if !generator['size_kw'].nil? and generator['size_kw'] != 0
-          feature_report.distributed_generation.add_tech 'generator',  URBANopt::Reporting::DefaultReports::Generator.new( {size_kw: (generator['size_kw'] || 0) })
+        if !generator['size_kw'].nil? && (generator['size_kw'] != 0)
+          feature_report.distributed_generation.add_tech 'generator', URBANopt::Reporting::DefaultReports::Generator.new({ size_kw: (generator['size_kw'] || 0) })
         end
 
         storage = reopt_output['outputs']['Scenario']['Site']['Storage']
-        if !storage['size_kw'].nil?  and storage['size_kw'] != 0
-          feature_report.distributed_generation.add_tech 'storage',  URBANopt::Reporting::DefaultReports::Storage.new( {size_kwh: (storage['size_kwh'] || 0), size_kw: (storage['size_kw'] || 0) })
+        if !storage['size_kw'].nil? && (storage['size_kw'] != 0)
+          feature_report.distributed_generation.add_tech 'storage', URBANopt::Reporting::DefaultReports::Storage.new({ size_kwh: (storage['size_kwh'] || 0), size_kw: (storage['size_kw'] || 0) })
         end
 
         generation_timeseries_kwh = Matrix[[0] * (8760 * feature_report.timesteps_per_hour)]
@@ -240,28 +234,18 @@ module URBANopt # :nodoc:
 
         unless reopt_output['outputs']['Scenario']['Site']['PV'].nil?
           reopt_output['outputs']['Scenario']['Site']['PV'].each do |pv|
-            if (pv['size_kw'] || 0) > 0
-              if !pv['year_one_power_production_series_kw'].nil?
-                generation_timeseries_kwh += Matrix[convert_powerflow_resolution(pv['year_one_power_production_series_kw'], reopt_resolution, feature_report.timesteps_per_hour)]
-              end
+            if (pv['size_kw'] || 0) > 0 && !pv['year_one_power_production_series_kw'].nil?
+              generation_timeseries_kwh += Matrix[convert_powerflow_resolution(pv['year_one_power_production_series_kw'], reopt_resolution, feature_report.timesteps_per_hour)]
             end
-           end
+          end
         end
 
-        unless reopt_output['outputs']['Scenario']['Site']['Wind'].nil?
-          if (reopt_output['outputs']['Scenario']['Site']['Wind']['size_kw'] || 0) > 0
-            if !reopt_output['outputs']['Scenario']['Site']['Wind']['year_one_power_production_series_kw'].nil?
-              generation_timeseries_kwh += Matrix[convert_powerflow_resolution(reopt_output['outputs']['Scenario']['Site']['Wind']['year_one_power_production_series_kw'], reopt_resolution, feature_report.timesteps_per_hour)]
-            end
-          end
+        if !reopt_output['outputs']['Scenario']['Site']['Wind'].nil? && ((reopt_output['outputs']['Scenario']['Site']['Wind']['size_kw'] || 0) > 0) && !reopt_output['outputs']['Scenario']['Site']['Wind']['year_one_power_production_series_kw'].nil?
+          generation_timeseries_kwh += Matrix[convert_powerflow_resolution(reopt_output['outputs']['Scenario']['Site']['Wind']['year_one_power_production_series_kw'], reopt_resolution, feature_report.timesteps_per_hour)]
         end
 
-        unless reopt_output['outputs']['Scenario']['Site']['Generator'].nil?
-          if (reopt_output['outputs']['Scenario']['Site']['Generator']['size_kw'] || 0) > 0
-            if !reopt_output['outputs']['Scenario']['Site']['Generator']['year_one_power_production_series_kw'].nil?
-              generation_timeseries_kwh += Matrix[convert_powerflow_resolution(reopt_output['outputs']['Scenario']['Site']['Generator']['year_one_power_production_series_kw'], reopt_resolution, feature_report.timesteps_per_hour)]
-            end
-          end
+        if !reopt_output['outputs']['Scenario']['Site']['Generator'].nil? && ((reopt_output['outputs']['Scenario']['Site']['Generator']['size_kw'] || 0) > 0) && !reopt_output['outputs']['Scenario']['Site']['Generator']['year_one_power_production_series_kw'].nil?
+          generation_timeseries_kwh += Matrix[convert_powerflow_resolution(reopt_output['outputs']['Scenario']['Site']['Generator']['year_one_power_production_series_kw'], reopt_resolution, feature_report.timesteps_per_hour)]
         end
 
         $generation_timeseries_kwh = generation_timeseries_kwh.to_a[0] || [0] * (8760 * feature_report.timesteps_per_hour)
@@ -359,7 +343,6 @@ module URBANopt # :nodoc:
           feature_report.timeseries_csv.column_names.push('REopt:ElectricityProduced:PV:ToLoad(kw)')
         end
 
-
         $pv_to_grid_col = feature_report.timeseries_csv.column_names.index('REopt:ElectricityProduced:PV:ToGrid(kw)')
         if $pv_to_grid_col.nil?
           $pv_to_grid_col = feature_report.timeseries_csv.column_names.length
@@ -441,14 +424,14 @@ module URBANopt # :nodoc:
         start_ts = (
                       (
                         ((start_date.yday - 1) * 60.0 * 60.0 * 24) +
-                        (((start_date.hour)  - 1) * 60.0 * 60.0) +
-                        (start_date.min * 60.0) + start_date.sec ) /
-                      (( 60 / feature_report.timesteps_per_hour ) * 60)
+                        ((start_date.hour - 1) * 60.0 * 60.0) +
+                        (start_date.min * 60.0) + start_date.sec) /
+                      ((60 / feature_report.timesteps_per_hour) * 60)
                     ).to_int
 
         mod_data = old_data.map.with_index do |x, i|
           if i > 0
-            modrow(x, start_ts + i -1)
+            modrow(x, start_ts + i - 1)
           else
             x
           end

data/lib/urbanopt/reopt/reopt_lite_api.rb

@@ -97,6 +97,7 @@ module URBANopt # :nodoc:
         if @use_localhost
           return URI.parse("http://127.0.0.1:8000/v1/job/#{run_uuid}/results")
         end
+
         return URI.parse("https://developer.nrel.gov/api/reopt/v1/job/#{run_uuid}/results?api_key=#{@nrel_developer_key}")
       end
 
@@ -114,6 +115,7 @@ module URBANopt # :nodoc:
         if @use_localhost
           return URI.parse("http://127.0.0.1:8000/v1/job/#{run_uuid}/resilience_stats")
         end
+
         return URI.parse("https://developer.nrel.gov/api/reopt/v1/job/#{run_uuid}/resilience_stats?api_key=#{@nrel_developer_key}")
       end
 
@@ -122,11 +124,20 @@ module URBANopt # :nodoc:
         tries = 0
         while tries < max_tries
           begin
-               result = http.request(r)
-               tries = 4
-             rescue StandardError
-               tries += 1
-             end
+            result = http.request(r)
+            # Result codes sourced from https://developer.nrel.gov/docs/errors/
+            if result.code == '429'
+              @@logger.fatal('Exceeded the REopt-Lite API limit of 300 requests per hour')
+              puts 'Using the URBANopt CLI to submit a Scenario optimization counts as one request per scenario'
+              puts 'Using the URBANopt CLI to submit a Feature optimization counts as one request per feature'
+              abort('Please wait and try again once the time period has elapsed')
+            elsif (result.code != '201') && (result.code != '200') # Anything in the 200s is success
+              @@logger.debug("REopt-Lite has returned a '#{result.code}' status code. Visit https://developer.nrel.gov/docs/errors/ for more status code information")
+            end
+            tries = 4
+          rescue StandardError
+            tries += 1
+          end
         end
         return result
       end
@@ -148,11 +159,11 @@ module URBANopt # :nodoc:
           http.use_ssl = true
         end
 
-        request = Net::HTTP::Post.new(@uri_submit, header)
-        request.body = ::JSON.generate(data, allow_nan: true)
+        post_request = Net::HTTP::Post.new(@uri_submit, header)
+        post_request.body = ::JSON.generate(data, allow_nan: true)
 
         # Send the request
-        response = make_request(http, request)
+        response = make_request(http, post_request)
 
         if !response.is_a?(Net::HTTPSuccess)
           @@logger.error('Check_connection Failed')
@@ -175,7 +186,6 @@ module URBANopt # :nodoc:
       # [*return:*] _Bool_ - Returns true if the post succeeeds. Otherwise returns false.
       ##
       def resilience_request(run_uuid, filename)
-
         if File.directory? filename
           if run_uuid.nil?
             run_uuid = 'error'
@@ -187,33 +197,38 @@ module URBANopt # :nodoc:
           @@logger.info("REopt results saved to #{filename}")
         end
 
-        #Submit Job
+        # Submit Job
         @@logger.info("Submitting Resilience Statistics job for #{run_uuid}")
         header = { 'Content-Type' => 'application/json' }
         http = Net::HTTP.new(@uri_submit_outagesimjob.host, @uri_submit_outagesimjob.port)
         if !@use_localhost
           http.use_ssl = true
         end
-        request = Net::HTTP::Post.new(@uri_submit_outagesimjob, header)
-        request.body = ::JSON.generate({"run_uuid" => run_uuid, "bau" => false }, allow_nan: true)
-        submit_response = make_request(http, request)
-        @@logger.info(submit_response.body)
+        post_request = Net::HTTP::Post.new(@uri_submit_outagesimjob, header)
+        post_request.body = ::JSON.generate({ 'run_uuid' => run_uuid, 'bau' => false }, allow_nan: true)
+        submit_response = make_request(http, post_request)
+        @@logger.debug(submit_response.body)
 
-        #Fetch Results
+        # Fetch Results
         uri = uri_resilience(run_uuid)
         http = Net::HTTP.new(uri.host, uri.port)
         if !@use_localhost
           http.use_ssl = true
         end
 
+        # Wait a few seconds for the REopt database to update before GETing results
+        sleep 5
+        get_request = Net::HTTP::Get.new(uri.request_uri)
+        response = make_request(http, get_request)
+
+        # Set a limit on retries when 404s are returned from REopt API
         elapsed_time = 0
         max_elapsed_time = 60 * 5
 
-        request = Net::HTTP::Get.new(uri.request_uri)
-        response = make_request(http, request)
-
-        while (elapsed_time < max_elapsed_time) & (response.code == "404")
-          response = make_request(http, request)
+        # If database still hasn't updated, wait a little longer and try again
+        while (elapsed_time < max_elapsed_time) & (response.code == '404')
+          response = make_request(http, get_request)
+          @@logger.warn('GET request was too fast for REOpt-Lite API. Retrying...')
           elapsed_time += 5
           sleep 5
         end
@@ -224,17 +239,16 @@ module URBANopt # :nodoc:
           File.open(filename, 'w+') do |f|
             f.puts(text)
           end
-        rescue
-          @@logger.info("Cannot write - #{filename}")
+        rescue StandardError
+          @@logger.error("Cannot write - #{filename}")
         end
 
-        if response.code == "200"
+        if response.code == '200'
           return data
         end
 
-        @@logger.info("Error from REopt API - #{data['Error']}")
+        @@logger.error("Error from REopt API - #{data['Error']}")
         return {}
-
       end
 
       ##
@@ -261,14 +275,14 @@ module URBANopt # :nodoc:
         if !@use_localhost
           http.use_ssl = true
         end
-        request = Net::HTTP::Post.new(@uri_submit, header)
-        request.body = ::JSON.generate(reopt_input, allow_nan: true)
+        post_request = Net::HTTP::Post.new(@uri_submit, header)
+        post_request.body = ::JSON.generate(reopt_input, allow_nan: true)
 
         # Send the request
-        response = make_request(http, request)
+        response = make_request(http, post_request)
 
         # Get UUID
-        run_uuid = JSON.parse(response.body, allow_nan:true)['run_uuid']
+        run_uuid = JSON.parse(response.body, allow_nan: true)['run_uuid']
 
         if File.directory? filename
           if run_uuid.nil?
@@ -286,7 +300,7 @@ module URBANopt # :nodoc:
           File.open(filename, 'w+') do |f|
             f.puts(text)
           end
-          @@logger.info("Cannot write - #{filename}")
+          @@logger.error("Cannot write - #{filename}")
           raise "Error in REopt optimization post - see #{filename}"
         end
 
@@ -298,17 +312,17 @@ module URBANopt # :nodoc:
           http.use_ssl = true
         end
 
-        request = Net::HTTP::Get.new(uri.request_uri)
+        get_request = Net::HTTP::Get.new(uri.request_uri)
 
         while status == 'Optimizing...'
-          response = make_request(http, request)
+          response = make_request(http, get_request)
 
-          data = JSON.parse(response.body, allow_nan:true)
+          data = JSON.parse(response.body, allow_nan: true)
 
-          if data['outputs']['Scenario']['Site']['PV'].kind_of?(Array)
+          if data['outputs']['Scenario']['Site']['PV'].is_a?(Array)
             pv_sizes = 0
             data['outputs']['Scenario']['Site']['PV'].each do |x|
-              pv_sizes = pv_sizes + x['size_kw'].to_f
+              pv_sizes += x['size_kw'].to_f
             end
           else
             pv_sizes = data['outputs']['Scenario']['Site']['PV']['size_kw'] || 0
@@ -323,13 +337,13 @@ module URBANopt # :nodoc:
         _tries = 0
         (check_complete = sizes == 0) && ((data['outputs']['Scenario']['Site']['Financial']['npv_us_dollars'] || 0) > 0)
         while (_tries < _max_retry) && check_complete
-          sleep 1
-          response = make_request(http, request)
-          data = JSON.parse(response.body, allow_nan:true)
-          if data['outputs']['Scenario']['Site']['PV'].kind_of?(Array)
+          sleep 3
+          response = make_request(http, get_request)
+          data = JSON.parse(response.body, allow_nan: true)
+          if data['outputs']['Scenario']['Site']['PV'].is_a?(Array)
             pv_sizes = 0
             data['outputs']['Scenario']['Site']['PV'].each do |x|
-              pv_sizes = pv_sizes + x['size_kw'].to_f
+              pv_sizes += x['size_kw'].to_f
             end
           else
             pv_sizes = data['outputs']['Scenario']['Site']['PV']['size_kw'] || 0
@@ -345,8 +359,8 @@ module URBANopt # :nodoc:
           File.open(filename, 'w+') do |f|
             f.puts(text)
           end
-        rescue
-          @@logger.info("Cannot write - #{filename}")
+        rescue StandardError
+          @@logger.error("Cannot write - #{filename}")
         end
 
         if status == 'optimal'