honeybee-openstudio 2.23.3 → 2.23.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e45179d0b62e6863ab40aa357fad8601ba8e66770756b652647784027b2548a
-  data.tar.gz: fd1e685397b0acca36ffcbb18fc9bfc5aed66236f30e37323caa76e033c78127
+  metadata.gz: 37bac7a5ba65cf8d92aaf98bfa2edc7b5778091b666ae9f3b5f00aa8c50bd478
+  data.tar.gz: 37955c43078610c4167847805469d4172475eaa8025082ed87b179b168284648
 SHA512:
-  metadata.gz: 938a7678b59f42e72187d2241c20b65479b6c7ae0daaae7c51cb92b35779c5470475ff6cd631b49a37eeb34dc6fee5558319979feb5048c50a11a1a407a09cb5
-  data.tar.gz: e39f4f8851d6f4c9fc15683b987c0a9f8fd2ecfb44f53c2d93eda9d40f27b7f25b81797ea5b5debcafb9ddef60ad2688c37ba5dffdc9c0e68e706a494ebf36fd
+  metadata.gz: 6562498061cef3f37bc83a3dfd8f5bb22e913d8f724d449c245a6cd1032916c9fe875101b41033a643680384c443fa94278dbaa32c40ea747ecf285b8d77118a
+  data.tar.gz: c59a06fa704b4312d73959d0edb848c867290f87061fcc4d8decb4a34ee11dff5570016714681cf4940aea9012cc1c6230c400ef9aef5d0a3f349a65192ee8b1

data/.github/workflows/ci.yaml

@@ -33,7 +33,7 @@ jobs:
       - name: set up node  # we need node for for semantic release
         uses: actions/setup-node@v2.1.2
         with:
-          node-version: 14.2.0
+          node-version: 14.17.0
       - name: install semantic-release
         run:
           npm install @semantic-release/exec

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.23.3'
+  spec.version       = '2.23.7'
   spec.authors       = ['Tanushree Charan', 'Dan Macumber', 'Chris Mackey', 'Mostapha Sadeghipour Roudsari']
   spec.email         = ['tanushree.charan@nrel.gov', 'chris@ladybug.tools']
 

data/lib/files/honeybee_adapter.rb

@@ -34,7 +34,7 @@ require 'openstudio/workflow/adapters/output_adapter'
 # Local file based workflow
 class HoneybeeAdapter < OpenStudio::Workflow::OutputAdapters
   def initialize(options = {})
-    puts "viiiiiiiiiiiiizzzzzzzzz!"
+
     STDOUT.flush
     super
   end

data/lib/from_openstudio/geometry/aperture.rb

@@ -72,7 +72,7 @@ module Honeybee
       unless sub_surface.isConstructionDefaulted
         construction = sub_surface.construction
         if !construction.empty?
-          constr_id = construction.get.nameString
+          constr_id = clean_identifier(construction.get.nameString)
           unless $window_constructions[constr_id].nil?
             hash[:construction] = constr_id
           end

data/lib/from_openstudio/geometry/door.rb

@@ -72,7 +72,7 @@ module Honeybee
       unless sub_surface.isConstructionDefaulted
         construction = sub_surface.construction
         if !construction.empty?
-          constr_id = construction.get.nameString
+          constr_id = clean_identifier(construction.get.nameString)
           if hash[:is_glass] && !$window_constructions[constr_id].nil?
             hash[:construction] = constr_id
           elsif !hash[:is_glass] && !$opaque_constructions[constr_id].nil?

data/lib/from_openstudio/geometry/face.rb

@@ -74,7 +74,7 @@ module Honeybee
       unless surface.isConstructionDefaulted
         construction = surface.construction
         if !construction.empty?
-          constr_id = construction.get.nameString
+          constr_id = clean_identifier(construction.get.nameString)
           unless $opaque_constructions[constr_id].nil?
             hash[:construction] = constr_id
           end

data/lib/from_openstudio/geometry/room.rb

@@ -112,7 +112,7 @@ module Honeybee
     def self.story_from_space(space)
       story = space.buildingStory
       if !story.empty?
-        return story.get.nameString
+        return clean_identifier(story.get.nameString)
       end
       nil
     end

data/lib/from_openstudio/geometry/shade.rb

@@ -62,7 +62,7 @@ module Honeybee
       unless shading_surface.isConstructionDefaulted
         construction = shading_surface.construction
         if !construction.empty?
-          const_name = construction.get.nameString
+          const_name = clean_identifier(construction.get.nameString)
           hash[:construction] = const_name
           unless $shade_constructions.has_key?(const_name)
             const_obj = construction.get
@@ -74,7 +74,10 @@ module Honeybee
 
       transmittance_schedule = shading_surface.transmittanceSchedule
       if !transmittance_schedule.empty?
-        hash[:transmittance_schedule] = transmittance_schedule.get.nameString
+        trans_sch_name = clean_identifier(transmittance_schedule.get.nameString)
+        unless $schedules[trans_sch_name].nil?
+          hash[:transmittance_schedule] = trans_sch_name
+        end
       end
 
       hash

data/lib/from_openstudio/model.rb

@@ -64,7 +64,8 @@ module Honeybee
       hash[:tolerance] = 0.01
       hash[:angle_tolerance] = 1.0
 
-      # Hashes for all constructions in the model
+      # Hashes for all shcedules and constructions in the model
+      $schedules = {}
       $opaque_constructions = {}
       $window_constructions = {}
       $shade_constructions = {}
@@ -282,7 +283,9 @@ module Honeybee
     def self.scheduleruleset_from_model(openstudio_model)
       result = []
       openstudio_model.getScheduleRulesets.each do |sch_ruleset|
-        result << ScheduleRulesetAbridged.from_schedule_ruleset(sch_ruleset)
+        sched_hash = ScheduleRulesetAbridged.from_schedule_ruleset(sch_ruleset)
+        $schedules[sched_hash[:identifier]] = sched_hash
+        result << sched_hash
       end
       result
     end

data/lib/from_openstudio/simulation/design_day.rb

@@ -37,7 +37,7 @@ module Honeybee
     def self.from_design_day(design_day)
       hash = {}
       hash[:type] = 'DesignDay'
-      hash[:name] = design_day.nameString
+      hash[:name] = clean_identifier(design_day.nameString)
       hash[:day_type] = day_type_from_design_day(design_day)
       hash[:dry_bulb_condition] = dry_bulb_condition_from_design_day(design_day)
       hash[:humidity_condition] = humidity_condition_from_design_day(design_day)

data/lib/measures/from_honeybee_simulation_parameter/measure.xml

@@ -83,4 +83,3 @@
     </file>
   </files>
 </measure>
-<error>cannot load such file -- honeybee/simulation/parameter</error>

data/lib/to_openstudio/construction/windowshade.rb

@@ -86,13 +86,13 @@ module Honeybee
       shd_mat_name = openstudio_model.getMaterialByName(@hash[:shade_material])
       unless shd_mat_name.empty?
         @shade_material = shd_mat_name.get
-        obj_type = @shade_material.iddObject.name
+        obj_type = @shade_material.iddObject.name.to_s
       end
       unless @shade_material.nil?
-        if obj_type == 'OS:WindowMaterial:StandardGlazing'
+        if obj_type == 'OS:WindowMaterial:StandardGlazing' || obj_type == 'OS:WindowMaterial:Glazing'
           if @shade_location == 'Interior'
               os_materials[-1] = @shade_material
-          elsif @shade_location == 'Exterior' | os_materials.length < 2
+          elsif @shade_location == 'Exterior' || os_materials.length < 2
               os_materials[0] = @shade_material
           else  # middle glass pane
               os_materials[-3] = @shade_material
@@ -150,9 +150,9 @@ module Honeybee
 
       # figure out the shading type
       unless @shade_material.nil?
-        obj_type = @shade_material.iddObject.name
+        obj_type = @shade_material.iddObject.name.to_s
       end
-      if obj_type == 'OS:WindowMaterial:StandardGlazing'
+      if obj_type == 'OS:WindowMaterial:StandardGlazing' || obj_type == 'OS:WindowMaterial:Glazing'
         shd_type = 'SwitchableGlazing'
       elsif obj_type == 'OS:WindowMaterial:Blind'
         if @shade_location == 'Between'

data/lib/to_openstudio/geometry/face.rb

@@ -43,9 +43,16 @@ module Honeybee
     end
 
     def to_openstudio(openstudio_model)
+      # get the vertices from the face
+      if @hash[:geometry][:vertices].nil?
+        hb_verts = @hash[:geometry][:boundary]
+      else
+        hb_verts = @hash[:geometry][:vertices]
+      end
+
       # reorder the vertices to ensure they start from the upper-left corner
       os_vertices = OpenStudio::Point3dVector.new
-      @hash[:geometry][:boundary].each do |vertex|
+      hb_verts.each do |vertex|
         os_vertices << OpenStudio::Point3d.new(vertex[0], vertex[1], vertex[2])
       end
       reordered_vertices = OpenStudio.reorderULC(os_vertices)

data/lib/to_openstudio/geometry/shade.rb

@@ -43,9 +43,16 @@ module Honeybee
     end
 
     def to_openstudio(openstudio_model)
+      # get the vertices from the face
+      if @hash[:geometry][:vertices].nil?
+        hb_verts = @hash[:geometry][:boundary]
+      else
+        hb_verts = @hash[:geometry][:vertices]
+      end
+
       # create the openstudio shading surface
       os_vertices = OpenStudio::Point3dVector.new
-      @hash[:geometry][:boundary].each do |vertex|
+      hb_verts.each do |vertex|
         os_vertices << OpenStudio::Point3d.new(vertex[0], vertex[1], vertex[2])
       end
       reordered_vertices = OpenStudio.reorderULC(os_vertices)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeybee-openstudio
 version: !ruby/object:Gem::Version
-  version: 2.23.3
+  version: 2.23.7
 platform: ruby
 authors:
 - Tanushree Charan
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-16 00:00:00.000000000 Z
+date: 2021-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler