urbanopt-reopt 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a833a15c613e58704915acea2d8a31cfd2ded2f9
-  data.tar.gz: 4aa9285353fb46787c73b12d7d6b4e47da0e4098
+  metadata.gz: 8000b40da80c144605734ce4d7284a86a2231e87
+  data.tar.gz: ae21be460c29a1d9027083d6d72c51abc8dd1a9b
 SHA512:
-  metadata.gz: 364198ba99ef78bc954f94519717abb17d7e24a9d1c46c08eee4b05c4881f6b510d1557e451f64ee8e42cf00c30c4892ddf018d1b5040d88f68c31456060fb46
-  data.tar.gz: 5040b4fdbee705eabd026c0139d76857b53fcd325aa6e0730f58eba29b5107c86d0bb8eb77c3fb064dc2173b60ed8077cb578e270305ef36ebdf09560aa1212a
+  metadata.gz: 4a64e8393504d9262f56ff09787ed7ba12d8830b891615e1d0bbce38aa984cddd4eb698544f259b028a33f14357b35955b2cd4dbc71e0aa4219f84059109016d
+  data.tar.gz: 69000034ce08db6386777d2dd351a0b607154e2e43c411d35f4bc2486dd126c73ef9e00b279df63270f968f9978acb59fc3430c9cebbdd4b22d0579eb84e7373

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # URBANopt REopt Gem
  
+## Version 0.2.1 
+* Corrects code checking PV size that fails on multi PV
+* Corrects parsing of site energy at timesteps other than 1 per hour
+
+
 ## Version 0.2.0 
 
 * Handles multiple PV systems in the REopt Lite assumptions

data/lib/urbanopt/reopt/feature_report_adapter.rb

@@ -104,17 +104,17 @@ module URBANopt # :nodoc:
         begin
           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_kwh = t.by_col[col_num].map { |e| ((e || 0) ) }
-          if energy_timeseries_kwh.length < (feature_report.timesteps_per_hour * 8760)
+          energy_timeseries_kw = t.by_col[col_num].map { |e| ((e * feature_report.timesteps_per_hour || 0) ) }
+          if energy_timeseries_kw.length < (feature_report.timesteps_per_hour * 8760)
             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])
             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_kwh = [0.0]*(start_ts-1) + energy_timeseries_kwh + [0.0]*((feature_report.timesteps_per_hour * 8760) - end_ts)
+            energy_timeseries_kw = [0.0]*(start_ts-1) + energy_timeseries_kw + [0.0]*((feature_report.timesteps_per_hour * 8760) - end_ts)
           end
-          reopt_inputs[:Scenario][:Site][:LoadProfile][:loads_kw] = energy_timeseries_kwh.map { |e| e ? e : 0 }[0,(feature_report.timesteps_per_hour * 8760)]
+          reopt_inputs[:Scenario][:Site][:LoadProfile][:loads_kw] = energy_timeseries_kw.map { |e| e ? e : 0 }[0,(feature_report.timesteps_per_hour * 8760)]
         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}"
@@ -200,7 +200,7 @@ module URBANopt # :nodoc:
           feature_report.distributed_generation.add_tech 'storage',  URBANopt::Scenario::DefaultReports::Storage.new( {size_kwh: (storage['size_kwh'] || 0), size_kw: (storage['size_kw'] || 0) })
         end
         
-        generation_timeseries_kwh = Matrix[[0] * 8760]
+        generation_timeseries_kwh = Matrix[[0] * (8760 * feature_report.timesteps_per_hour)]
 
         unless reopt_output['outputs']['Scenario']['Site']['PV'].nil?
           reopt_output['outputs']['Scenario']['Site']['PV'].each do |pv| 
@@ -236,7 +236,7 @@ module URBANopt # :nodoc:
           end
         end
 
-        $generation_timeseries_kwh = generation_timeseries_kwh.to_a[0] || [0] * 8760
+        $generation_timeseries_kwh = generation_timeseries_kwh.to_a[0] || [0] * (8760 * feature_report.timesteps_per_hour)
         $generation_timeseries_kwh_col = feature_report.timeseries_csv.column_names.index('REopt:ElectricityProduced:Total(kw)')
         if $generation_timeseries_kwh_col.nil?
           $generation_timeseries_kwh_col = feature_report.timeseries_csv.column_names.length

data/lib/urbanopt/reopt/reopt_lite_api.rb

@@ -196,7 +196,15 @@ module URBANopt # :nodoc:
         while status == 'Optimizing...'
           response = make_request(http, request)
           data = JSON.parse(response.body)
-          sizes = (data['outputs']['Scenario']['Site']['PV']['size_kw'] || 0) + (data['outputs']['Scenario']['Site']['Storage']['size_kw'] || 0) + (data['outputs']['Scenario']['Site']['Wind']['size_kw'] || 0) + (data['outputs']['Scenario']['Site']['Generator']['size_kw'] || 0)
+          if data['outputs']['Scenario']['Site']['PV'].kind_of?(Array)
+            pv_sizes = 0
+            data['outputs']['Scenario']['Site']['PV'].each do |x|
+              pv_sizes = pv_sizes + x['size_kw'].to_f
+            end 
+          else
+            pv_sizes = data['outputs']['Scenario']['Site']['PV']['size_kw'] || 0
+          end
+          sizes = pv_sizes + (data['outputs']['Scenario']['Site']['Storage']['size_kw'] || 0) + (data['outputs']['Scenario']['Site']['Wind']['size_kw'] || 0) + (data['outputs']['Scenario']['Site']['Generator']['size_kw'] || 0)
           status = data['outputs']['Scenario']['status']
 
           sleep 5
@@ -209,7 +217,15 @@ module URBANopt # :nodoc:
           sleep 1
           response = make_request(http, request)
           data = JSON.parse(response.body)
-          sizes = (data['outputs']['Scenario']['Site']['PV']['size_kw'] || 0) + (data['outputs']['Scenario']['Site']['Storage']['size_kw'] || 0) + (data['outputs']['Scenario']['Site']['Wind']['size_kw'] || 0) + (data['outputs']['Scenario']['Site']['Generator']['size_kw'] || 0)
+          if data['outputs']['Scenario']['Site']['PV'].kind_of?(Array)
+            pv_sizes = 0
+            data['outputs']['Scenario']['Site']['PV'].each do |x|
+              pv_sizes = pv_sizes + x['size_kw'].to_f
+            end 
+          else
+            pv_sizes = data['outputs']['Scenario']['Site']['PV']['size_kw'] || 0
+          end
+          sizes = pv_sizes + (data['outputs']['Scenario']['Site']['Storage']['size_kw'] || 0) + (data['outputs']['Scenario']['Site']['Wind']['size_kw'] || 0) + (data['outputs']['Scenario']['Site']['Generator']['size_kw'] || 0)
           (check_complete = sizes == 0) && ((data['outputs']['Scenario']['Site']['Financial']['npv_us_dollars'] || 0) > 0)
           _tries += 1
         end

data/lib/urbanopt/reopt/reopt_post_processor.rb

@@ -223,7 +223,7 @@ module URBANopt # :nodoc:
               else
                 warn "Could not save feature reports - the number of save names provided did not match the number of feature reports"
               end
-          end
+            end
           rescue StandardError
             @@logger.info("Could not optimize Feature Report #{feature_report.name} #{feature_report.id}")
           end

data/lib/urbanopt/reopt/scenario_report_adapter.rb

@@ -115,21 +115,25 @@ module URBANopt # :nodoc:
           reopt_inputs[:Scenario][:Site][:land_acres] = scenario_report.program.site_area * 1.0 / 43560 # acres/sqft
         end
 
+        unless scenario_report.timesteps_per_hour.nil?
+          reopt_inputs[:Scenario][:time_steps_per_hour] = scenario_report.timesteps_per_hour
+        end
+
         # Update load profile info
         begin
           col_num = scenario_report.timeseries_csv.column_names.index('Electricity:Facility(kWh)')
           t = CSV.read(scenario_report.timeseries_csv.path, headers: true, converters: :numeric)
-          energy_timeseries_kwh = t.by_col[col_num].map { |e| ((e || 0) ) }
-          if energy_timeseries_kwh.length < (scenario_report.timesteps_per_hour * 8760)
+          energy_timeseries_kw = t.by_col[col_num].map { |e| ((e * scenario_report.timesteps_per_hour || 0) ) }
+          if energy_timeseries_kw.length < (scenario_report.timesteps_per_hour * 8760)
             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 / scenario_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 / scenario_report.timesteps_per_hour ) * 60)).to_int
-            energy_timeseries_kwh = [0.0]*(start_ts-1) + energy_timeseries_kwh + [0.0]*((scenario_report.timesteps_per_hour * 8760) - end_ts)
+            energy_timeseries_kw = [0.0]*(start_ts-1) + energy_timeseries_kw + [0.0]*((scenario_report.timesteps_per_hour * 8760) - end_ts)
           end
-          reopt_inputs[:Scenario][:Site][:LoadProfile][:loads_kw] = energy_timeseries_kwh.map { |e| e ? e : 0 }[0,(scenario_report.timesteps_per_hour * 8760)]
+          reopt_inputs[:Scenario][:Site][:LoadProfile][:loads_kw] = energy_timeseries_kw.map { |e| e ? e : 0 }[0,(scenario_report.timesteps_per_hour * 8760)]
         rescue StandardError
           @@logger.error("Could not parse the annual electric load from the timeseries csv - #{scenario_report.timeseries_csv.path}")
           raise "Could not parse the annual electric load from the timeseries csv - #{scenario_report.timeseries_csv.path}"
@@ -237,7 +241,7 @@ module URBANopt # :nodoc:
           scenario_report.distributed_generation.add_tech 'storage',  URBANopt::Scenario::DefaultReports::Storage.new( {size_kwh: (storage['size_kwh'] || 0), size_kw: (storage['size_kw'] || 0) })
         end
         
-        generation_timeseries_kwh = Matrix[[0] * 8760]
+        generation_timeseries_kwh = Matrix[[0] * (8760 * scenario_report.timesteps_per_hour)]
 
         
         reopt_output['outputs']['Scenario']['Site']['PV'].each do |pv| 
@@ -272,7 +276,7 @@ module URBANopt # :nodoc:
           end
         end
 
-        $generation_timeseries_kwh = generation_timeseries_kwh.to_a[0]
+        $generation_timeseries_kwh = generation_timeseries_kwh.to_a[0] || [0] * (8760 * scenario_report.timesteps_per_hour)
         $generation_timeseries_kwh_col = scenario_report.timeseries_csv.column_names.index('REopt:ElectricityProduced:Total(kw)')
         if $generation_timeseries_kwh_col.nil?
           $generation_timeseries_kwh_col = scenario_report.timeseries_csv.column_names.length

data/lib/urbanopt/reopt/version.rb

@@ -30,6 +30,6 @@
 
 module URBANopt # :nodoc:
   module REopt # :nodoc:
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.2.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: urbanopt-reopt
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - ''
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler