honeybee-openstudio 2.34.7 → 2.34.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96a0a6d175cfae2a36f0daa5775cb1f6979fce972e4bdb818dac0e1df67cb9ef
-  data.tar.gz: e868b0348f3bd8ea2dcdca115e5e7cbbb955c528a97c5b27dcd6b74e5fbb2a73
+  metadata.gz: c4d3ae6c224643694b834d77b34a79550d059ad0df9104d90509ae931a844337
+  data.tar.gz: 1ed909608fb5019d1549d26b3200cf238304edf590f993a59c016941d6c1e6a6
 SHA512:
-  metadata.gz: 9af5f2469ca5849ccc9c5cd12d55ec3bdf495aa8fb75e966948cfa2e6edf359aaa86cc63cd8deadc5d4f8953d05412e1bf5af2500e08f86be6ac63e009a103bd
-  data.tar.gz: a76b8a5d6899d58366303323625fc0428cc6f1ac7602466980a7da0e8b10b29527634c5ebf13622e0d39e363bd5fc8964a869251d4baa41d8626ee904cff2de8
+  metadata.gz: 4be5fafda6b741381169f7318d713dd34e74ddf22c7bc0c8d49bf4db8f2929e4136d1b861e6fc7eb29474d164e2e11d3157e1b820fc14c2f51e479278475fa71
+  data.tar.gz: 5e347d2612b3a8fe6fce4a283ee1144759d09e9e7d355b9f36123c8f79dcf223a63d942b5137dafee1cd1cea872535a40a6878a5be307eb1eb370c0b09975fc5

data/.github/workflows/ci.yaml

@@ -15,8 +15,8 @@ jobs:
       run: |
         echo $(pwd)
         echo $(ls)
-        docker pull nrel/openstudio:3.5.0
-        docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.5.0
+        docker pull nrel/openstudio:3.6.1
+        docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.6.1
         docker exec -t test pwd
         docker exec -t test ls
         docker exec -t test bundle update

data/honeybee-openstudio.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'honeybee-openstudio'
-  spec.version       = '2.34.7'
+  spec.version       = '2.34.9'
   spec.authors       = ['Tanushree Charan', 'Dan Macumber', 'Chris Mackey', 'Mostapha Sadeghipour Roudsari']
   spec.email         = ['tanushree.charan@nrel.gov', 'chris@ladybug.tools']
 
@@ -25,14 +25,14 @@ Gem::Specification.new do |spec|
     spec.required_ruby_version = "~> 2.7.0"
 
     spec.add_development_dependency "bundler",        "~> 2.1"
-    spec.add_development_dependency "public_suffix",  "~> 3.1.1"
-    spec.add_development_dependency "json-schema",    "~> 2.8.1"
-    spec.add_development_dependency "rake",           "~> 13.0"
+    spec.add_development_dependency "public_suffix",  "~> 5.0.3"
+    spec.add_development_dependency "json-schema",    "~> 2.7.0"
+    spec.add_development_dependency "rake",           "~> 13.0.6"
     spec.add_development_dependency "rspec",          "~> 3.9"
     spec.add_development_dependency "rubocop",        "~> 1.15.0"
   end
 
   spec.add_dependency 'json_pure'
   spec.add_dependency 'openstudio-extension', '0.6.1'
-  spec.add_dependency 'openstudio-standards', '~> 0.3.0'
+  spec.add_dependency 'openstudio-standards', '~> 0.4.0'
 end

data/lib/files/urbanopt_Gemfile

@@ -11,30 +11,30 @@ gem 'builder', '3.2.4'
 gem 'docile', '1.4.0'
 gem 'faraday', '1.0.1'
 gem 'git', '1.12.0'
-gem 'json-schema', '2.8.1'
+gem 'json-schema', '2.7.0'
 gem 'json_pure', '2.6.3'
 gem 'macaddr', '1.7.2'
 gem 'minitar', '0.9'
+gem 'minitest', '5.14.4'
+gem 'minitest-reporters', '1.4.3'
 gem 'multipart-post', '2.3.0'
 gem 'octokit', '4.18.0'
-gem 'openstudio-calibration', '0.7.0'
-gem 'openstudio-common-measures', '0.7.0'
-gem 'openstudio-ee', '0.7.0'
-gem 'openstudio-extension', '0.6.0'
-gem 'openstudio-geb', '0.2.1'
-gem 'openstudio-load-flexibility-measures', '0.6.1'
+gem 'openstudio-calibration', '0.8.0'
+gem 'openstudio-common-measures', '0.8.0'
+gem 'openstudio-ee', '0.8.0'
+gem 'openstudio-extension', '0.6.1'
+gem 'openstudio-geb', '0.3.2'
+gem 'openstudio-load-flexibility-measures', '0.7.0'
 gem 'openstudio_measure_tester', '0.3.2'
-gem 'openstudio-model-articulation', '0.7.0'
-gem 'openstudio-standards', '0.3.0'
+gem 'openstudio-model-articulation', '0.8.0'
+gem 'openstudio-standards', '0.4.0'
 gem 'openstudio-workflow', '2.3.1'
 gem 'parallel', '1.19.2'
 gem 'parser', '3.2.2.2'
-gem 'public_suffix', '5.0.1'
-gem 'minitest', '5.14.4'
-gem 'minitest-reporters', '1.4.3'
-gem 'rchardet', '1.8.0'
-gem 'rake', '13.0.6'
+gem 'public_suffix', '5.0.3'
 gem 'rainbow', '3.1.1'
+gem 'rake', '13.0.6'
+gem 'rchardet', '1.8.0'
 gem 'regexp_parser', '2.8.1'
 gem 'rexml', '3.2.5'
 gem 'rubocop', '1.15.0'
@@ -50,12 +50,12 @@ gem 'simplecov-html', '0.12.3'
 gem 'spreadsheet', '1.2.9'
 gem 'systemu', '2.6.5'
 gem 'unicode-display_width', '2.4.2'
-gem 'urbanopt-core', '0.9.0'
-gem 'urbanopt-geojson', '0.9.0'
-gem 'urbanopt-reporting', '0.7.0'
+gem 'urbanopt-core', '0.10.0'
+gem 'urbanopt-geojson', '0.10.0'
+gem 'urbanopt-reporting', '0.8.0'
 gem 'uuid', '2.3.9'
 gem 'yamler', '0.1.0'
 gem 'zliby', '0.0.5'
 
 # include the honeybee-openstudio-gem
-gem 'honeybee-openstudio', '2.33.4'
+gem 'honeybee-openstudio', '2.34.9'

data/lib/to_openstudio/construction/windowshade.rb

@@ -45,19 +45,20 @@ module Honeybee
     end
 
     def to_openstudio(openstudio_model)
-      # write the shaded and unsaded versions of the construction into the model
-      # reverse the shaded and unshaded identifiers so unshaded one is assigned to apertures
+      # set the unshaded ID to be the whole construction ID so unshaded one is assigned to apertures
       unshd_id = @hash[:identifier]
-      shd_id = @hash[:window_construction][:identifier]
       @hash[:window_construction][:identifier] = unshd_id
+      # derive a new ID for the shaded construction that will not conflict with any bare versions of the construction
+      shd_id = @hash[:identifier]  + '_Shaded'
       @hash[:identifier] = shd_id
+
       # create the unshaded construction
       unshd_constr_obj = WindowConstructionAbridged.new(@hash[:window_construction])
       @construction = unshd_constr_obj.to_openstudio(openstudio_model)
 
       # create the shaded construction
       @shade_construction = OpenStudio::Model::Construction.new(openstudio_model)
-      @shade_construction.setName(shd_id)
+      @shade_construction.setName(@hash[:identifier])
       unless @hash[:display_name].nil?
         @shade_construction.setDisplayName(@hash[:display_name])
       end

data/lib/to_openstudio/schedule/fixed_interval.rb

@@ -85,6 +85,55 @@ module Honeybee
       defaults[:placeholder_value][:default]
     end
 
+    def full_annual_values(openstudio_model)
+      # get start and end date times
+      yd = openstudio_model.getYearDescription
+      date_time = OpenStudio::DateTime.new(yd.makeDate(1, 1), OpenStudio::Time.new(0,0,0))
+      start_date_time = OpenStudio::DateTime.new(yd.makeDate(start_month, start_day), OpenStudio::Time.new(0,0,0))
+      end_date_time = OpenStudio::DateTime.new(yd.makeDate(12, 31), OpenStudio::Time.new(1,0,0))
+
+      # get timestep
+      interval_length = 60 / timestep
+      dt = OpenStudio::Time.new(0, 0, interval_length, 0)
+
+      # get values and date times
+      values = @hash[:values]
+      num_values = values.size
+      i_values = 0
+      padded_values = []
+      date_times = []
+      pv = placeholder_value
+
+      while date_time < end_date_time
+        date = date_time.date
+        time = date_time.time
+        date_times << "#{date.dayOfMonth} #{date.monthOfYear.valueName} #{time.hours.to_s.rjust(2,'0')}:#{time.minutes.to_s.rjust(2,'0')}"
+
+        if date_time < start_date_time
+          padded_values << pv
+        elsif i_values < num_values
+          padded_values << values[i_values]
+          i_values += 1
+        else
+          padded_values << pv
+        end
+
+        date_time += dt
+      end
+
+      # if there are still more values to add, this indicates a reversed period
+      if i_values + 1 < num_values
+        overwrite_index = 0
+        while i_values != num_values
+          padded_values[overwrite_index] = values[i_values]
+          i_values += 1
+          overwrite_index += 1
+        end
+      end
+
+      return padded_values, date_times
+    end
+
     def to_schedule_fixed_interval(openstudio_model)
       # create the new schedule
       os_fi_schedule = OpenStudio::Model::ScheduleFixedInterval.new(openstudio_model)
@@ -92,9 +141,11 @@ module Honeybee
       unless @hash[:display_name].nil?
         os_fi_schedule.setDisplayName(@hash[:display_name])
       end
-      # assign start date
-      os_fi_schedule.setStartMonth(start_month)
-      os_fi_schedule.setStartDay(start_day)
+
+      # assign start date and the out of range value
+      os_fi_schedule.setStartMonth(1)
+      os_fi_schedule.setStartDay(1)
+      os_fi_schedule.setOutOfRangeValue(placeholder_value)
 
       # assign the interpolate value
       os_fi_schedule.setInterpolatetoTimestep(interpolate)
@@ -115,8 +166,9 @@ module Honeybee
 
       # assign the values as a timeseries
       year_description = openstudio_model.getYearDescription
-      start_date = year_description.makeDate(start_month, start_day)
-      timeseries = OpenStudio::TimeSeries.new(start_date, openstudio_interval_length, OpenStudio.createVector(@hash[:values]), '')
+      start_date = year_description.makeDate(1, 1)
+      all_values, date_times = full_annual_values(openstudio_model)
+      timeseries = OpenStudio::TimeSeries.new(start_date, openstudio_interval_length, OpenStudio.createVector(all_values), '')
       os_fi_schedule.setTimeSeries(timeseries)
 
       os_fi_schedule
@@ -127,41 +179,9 @@ module Honeybee
       # in order to combine schedules in the same csv file they must have the same key
       schedule_key = "#{@hash[:identifier]}_#{start_month}_#{start_day}_#{timestep}"
 
-      # get start and end date times
-      yd = openstudio_model.getYearDescription
-      date_time = OpenStudio::DateTime.new(yd.makeDate(1, 1), OpenStudio::Time.new(0,0,0))
-      start_date_time = OpenStudio::DateTime.new(yd.makeDate(start_month, start_day), OpenStudio::Time.new(0,0,0))
-      end_date_time = OpenStudio::DateTime.new(yd.makeDate(12, 31), OpenStudio::Time.new(1,0,0))
-
-      # get timestep
+      # get the list of values for the whole year
       interval_length = 60 / timestep
-      dt = OpenStudio::Time.new(0, 0, interval_length, 0)
-
-      # get values and date times
-      values = @hash[:values]
-      num_values = values.size
-      i_values = 0
-      padded_values = []
-      date_times = []
-      pv = placeholder_value
-
-      while date_time < end_date_time
-        date = date_time.date
-        time = date_time.time
-        date_times << "#{date.dayOfMonth} #{date.monthOfYear.valueName} #{time.hours.to_s.rjust(2,'0')}:#{time.minutes.to_s.rjust(2,'0')}"
-
-        if date_time < start_date_time
-          padded_values << pv
-        elsif i_values < num_values
-          padded_values << values[i_values]
-          i_values += 1
-        else
-          padded_values << pv
-        end
-
-        date_time += dt
-      end
-
+      padded_values, date_times = full_annual_values(openstudio_model)
 
       # find or create the schedule csv object which will hold the filename and columns
       filename = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeybee-openstudio
 version: !ruby/object:Gem::Version
-  version: 2.34.7
+  version: 2.34.9
 platform: ruby
 authors:
 - Tanushree Charan
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-04 00:00:00.000000000 Z
+date: 2023-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -47,14 +47,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 description: Library and measures for translating between Honeybee JSON schema and
   OpenStudio Model schema (OSM).
 email: