urbanopt-reopt 0.12.0 → 1.1.0

data/lib/urbanopt/reopt/scenario_report_adapter.rb

@@ -43,9 +43,9 @@ module URBANopt # :nodoc:
         else
           @@logger.info('Using default REopt assumptions')
           reopt_inputs = {
-            Settings:{},
+            Settings: {},
             Site: {},
-            Financial:{},
+            Financial: {},
             ElectricTariff: {
               monthly_demand_rates: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
               monthly_energy_rates: [0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13]
@@ -277,12 +277,8 @@ module URBANopt # :nodoc:
           wind = reopt_output['outputs']['Wind']
           # find size_class
           size_class = nil
-          if reopt_output['inputs']['Wind']['size_class']
-            size_class = reopt_output['inputs']['Wind']['size_class']
-          else
-            size_class = 'commercial' # default
-          end
-          scenario_report.distributed_generation.add_tech 'wind', URBANopt::Reporting::DefaultReports::Wind.new({ size_kw: (wind['size_kw'] || 0), size_class: size_class, average_yearly_energy_produced_kwh: (wind['average_yearly_energy_produced_kwh'] || 0) })
+          size_class = reopt_output['inputs']['Wind']['size_class'] || 'commercial'
+          scenario_report.distributed_generation.add_tech 'wind', URBANopt::Reporting::DefaultReports::Wind.new({ size_kw: (wind['size_kw'] || 0), size_class:, average_yearly_energy_produced_kwh: (wind['average_yearly_energy_produced_kwh'] || 0) })
         end
 
         if reopt_output['outputs'].key?('Generator')
@@ -491,7 +487,7 @@ module URBANopt # :nodoc:
           data[$storage_to_grid_col] = $storage_to_grid[idx] || 0 if defined?(storage)
           data[$storage_soc_col] = $storage_soc[idx] || 0 if defined?(storage)
           data[$generator_total_col] = $generator_total[idx] || 0 if defined?(generator)
-          data[$generator_to_battery_col] = $generator_to_battery[idx] || 0 if (defined?(generator) && defined?(storage))
+          data[$generator_to_battery_col] = $generator_to_battery[idx] || 0 if defined?(generator) && defined?(storage)
           data[$generator_to_load_col] = $generator_to_load[idx] || 0 if defined?(generator)
           data[$generator_to_grid_col] = $generator_to_grid[idx] || 0 if defined?(generator)
           data[$pv_total_col] = $pv_total[idx] || 0
@@ -499,7 +495,7 @@ module URBANopt # :nodoc:
           data[$pv_to_load_col] = $pv_to_load[idx] || 0
           data[$pv_to_grid_col] = $pv_to_grid[idx] || 0
           data[$wind_total_col] = $wind_total[idx] || 0 if defined?(wind)
-          data[$wind_to_battery_col] = $wind_to_battery[idx] || 0 if (defined?(wind) && defined?(storage))
+          data[$wind_to_battery_col] = $wind_to_battery[idx] || 0 if defined?(wind) && defined?(storage)
           data[$wind_to_load_col] = $wind_to_load[idx] || 0 if defined?(wind)
           data[$wind_to_grid_col] = $wind_to_grid[idx] || 0 if defined?(wind)
           return data

data/lib/urbanopt/reopt/utilities.rb

@@ -36,7 +36,7 @@ def convert_powerflow_resolution(timeseries_kw, original_res, destination_res)
     current_origin_idx = 0 # current integer index of the origin timeseries
     (0..(8760 * destination_res - 1)).each do |ts|
       next_stopping_ts = current_origin_ts + stepping_interval # stop at the next destination interval
-      total_power = [] # create to store wieghted origin timestep values to average
+      total_power = [] # create to store weighted origin timestep values to average
       while current_origin_ts != next_stopping_ts
         next_origin_ts_int = Integer(current_origin_ts) + 1
         # Calc next stopping point that will being you to the next origin or destination time step
@@ -61,7 +61,7 @@ def convert_powerflow_resolution(timeseries_kw, original_res, destination_res)
     # Timesteps will be expanded, i.e. 8760 -> 35040
 
     # This algorithm works by stepping along the destination timeseries. Steps are made to the next
-    # destination or origin breakpoint, and at each step the propotional amount of the origin stepped
+    # destination or origin breakpoint, and at each step the proportional amount of the origin stepped
     # is added to the destination. For example, in in EX 1 below 4 steps are made each with adding the full amount of
     # the origin (1, 1, 2 and 2) since each in the destination overlaps perfectly with 2 origin
     # timesteps. In EX 2, the origin overlaps with the first 2 destination timesteps but the third

data/lib/urbanopt/reopt/version.rb

@@ -5,6 +5,6 @@
 
 module URBANopt # :nodoc:
   module REopt # :nodoc:
-    VERSION = '0.12.0'.freeze
+    VERSION = '1.1.0'.freeze
   end
 end

data/lib/urbanopt/reopt.rb

@@ -9,3 +9,6 @@ require 'urbanopt/reopt/feature_report_adapter'
 require 'urbanopt/reopt/scenario_report_adapter'
 require 'urbanopt/reopt/reopt_post_processor'
 require 'urbanopt/reopt/version'
+require 'urbanopt/reopt/reopt_ghp_post_processor'
+require 'urbanopt/reopt/reopt_ghp_adapter'
+require 'urbanopt/reopt/reopt_ghp_api'

data/urbanopt-reopt.gemspec

@@ -21,17 +21,19 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
+  # We support exactly Ruby v3.2.2 because os-extension requires bundler==2.4.10 and that requires Ruby 3.2.2: https://stdgems.org/bundler/
+  # It would be nice to be able to use newer patches of Ruby 3.2, which would require os-extension to relax its dependency on bundler.
+  spec.required_ruby_version = '3.2.2'
 
-  spec.required_ruby_version = '~> 2.7.0'
+  spec.add_dependency 'openstudio-extension', '~> 0.9.4'
+  # Matrix is in stdlib, but needs to be specifically added here for compatibility with Ruby 3.2
+  spec.add_dependency 'matrix', '~> 0.4.2'
+  spec.add_dependency 'urbanopt-scenario', '~> 1.1.0'
 
-  spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.9'
-  spec.add_development_dependency 'rubocop', '~> 1.15.0'
-  spec.add_development_dependency 'simplecov', '~> 0.18.2'
+  spec.add_development_dependency 'rubocop', '~> 1.50'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.20'
+  spec.add_development_dependency 'simplecov', '~> 0.22.0'
   spec.add_development_dependency 'simplecov-lcov', '~> 0.8.0'
-  spec.add_development_dependency 'openstudio-extension', '~> 0.7.1'
-
-  spec.add_dependency 'certified', '~> 1'
-  spec.add_dependency 'urbanopt-scenario', '~> 0.12.0'
 end

metadata

@@ -1,141 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: urbanopt-reopt
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 1.1.0
 platform: ruby
 authors:
 - ''
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-07 00:00:00.000000000 Z
+date: 2025-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: openstudio-extension
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :development
+        version: 0.9.4
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 0.9.4
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: matrix
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
+        version: 0.4.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: urbanopt-scenario
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
-  type: :development
+        version: 1.1.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.2
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.2
+        version: '3.9'
 - !ruby/object:Gem::Dependency
-  name: simplecov-lcov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '1.50'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '1.50'
 - !ruby/object:Gem::Dependency
-  name: openstudio-extension
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '1.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '1.20'
 - !ruby/object:Gem::Dependency
-  name: certified
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
+        version: 0.22.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
-  name: urbanopt-scenario
+  name: simplecov-lcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
-  type: :runtime
+        version: 0.8.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.8.0
 description: Classes and measures for utilizing the REopt API within OpenStudio workflows.
 email:
 - ''
@@ -189,9 +189,14 @@ files:
 - lib/urbanopt/reopt.rb
 - lib/urbanopt/reopt/extension.rb
 - lib/urbanopt/reopt/feature_report_adapter.rb
+- lib/urbanopt/reopt/reopt_ghp_adapter.rb
+- lib/urbanopt/reopt/reopt_ghp_api.rb
+- lib/urbanopt/reopt/reopt_ghp_files/reopt_ghp_assumption.json
+- lib/urbanopt/reopt/reopt_ghp_post_processor.rb
 - lib/urbanopt/reopt/reopt_lite_api.rb
 - lib/urbanopt/reopt/reopt_logger.rb
 - lib/urbanopt/reopt/reopt_post_processor.rb
+- lib/urbanopt/reopt/reopt_schema/REopt-GHP-input.json
 - lib/urbanopt/reopt/reopt_schema/reopt_input_schema.json
 - lib/urbanopt/reopt/reopt_schema/reopt_output_schema.json
 - lib/urbanopt/reopt/scenario/reopt_scenario_csv.rb
@@ -210,16 +215,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - '='
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Accessing the REopt API within OpenStudio workflows.