honeybee-openstudio 2.23.2 → 2.23.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70d85a158c3143c24582c3f1c29fd12c166da8ce20add49553cf9c64d6a320f2
-  data.tar.gz: 63e8a77445232cd5f90fd3d3effdcd8816cd3982e50116ecca67e6656940589d
+  metadata.gz: 779f0f0085d9d4651f48c715cb6c70813d687dce61a540c90766b2efa5d42e88
+  data.tar.gz: 8c71a2c98b1e041ee9589115e6e3cc88380b7a670ccca558a010d6059835f0dc
 SHA512:
-  metadata.gz: bdcbacab7a8801c1a24044e9eef069bca9ffde80734fcb77c78b147492ba7ee30fdf6f3b67faf8990f8c5b11fdd5b60970e397423c933a904c8cf46f9da2ca00
-  data.tar.gz: 7488acf2edc55f7fc2bfb5b555b1095fc1e1493eba59044969c6c09003087aa103d628c2816f06ff9e89703f680f579190e615be0422249330beacd05851fbc0
+  metadata.gz: 6bb6241027111bfcd79562bb0e2cb489c6bb0ae4883191572938bc94015c46b1c81c9a1037db2a4886263f55a0a001e934dbb17e537eaa8669bdd1266d7da65c
+  data.tar.gz: '059d0b94c4f7ec99ec9f8c9ae6ce8c524e46be2a00ea5edf8d461dacb446d5e15592c5ab1427885a6bb6b89592e41dddfc98e24073711bd45575427cea2bf102'

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.2'
+  spec.version       = '2.23.6'
   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/dynamic.rb

@@ -88,7 +88,7 @@ module Honeybee
 
       # set up the EMS sensor for the schedule value
       state_sch = openstudio_model.getScheduleByName(@hash[:schedule])
-      @sch_sensor_name = replace_ems_special_characters(@hash[:identifier]) + '_Sensor' + @@sensor_count.to_s
+      @sch_sensor_name = replace_ems_special_characters(@hash[:identifier]) + 'Sensor' + @@sensor_count.to_s
       @@sensor_count = @@sensor_count + 1
       unless state_sch.empty?  # schedule not specified
         sch_var = OpenStudio::Model::OutputVariable.new('Schedule Value', openstudio_model)
@@ -107,18 +107,15 @@ module Honeybee
       @sub_faces.each do |dyn_window|
         window_act = OpenStudio::Model::EnergyManagementSystemActuator.new(
           dyn_window, 'Surface', 'Construction State')
-        dyn_window_name = dyn_window.name
-        unless dyn_window_name.empty?
-          act_name = replace_ems_special_characters(dyn_window_name.get) + '_Actuator' + @@actuator_count.to_s
-          @@actuator_count = @@actuator_count + 1
-          window_act.setName(act_name)
-          actuator_names << act_name
-        end
+        act_name = replace_ems_special_characters(dyn_window.nameString) + 'Actuator' + @@actuator_count.to_s
+        @@actuator_count = @@actuator_count + 1
+        window_act.setName(act_name)
+        actuator_names << act_name
       end
 
       # create the EMS Program to accout for each state according to the control logic
       ems_program = OpenStudio::Model::EnergyManagementSystemProgram.new(openstudio_model)
-      prog_name = replace_ems_special_characters(@hash[:identifier]) + '_StateChange' + @@program_count.to_s
+      prog_name = replace_ems_special_characters(@hash[:identifier]) + 'StateChange' + @@program_count.to_s
       @@program_count = @@program_count + 1
       ems_program.setName(prog_name)
 
@@ -143,12 +140,9 @@ module Honeybee
         # create the construction index variable
         constr_i = OpenStudio::Model::EnergyManagementSystemConstructionIndexVariable.new(
           openstudio_model, construction)
-        constr_name = construction.name
-        unless constr_name.empty?
-          constr_i_name = replace_ems_special_characters(constr_name.get) + '_State' + @@state_count.to_s
-          @@state_count = @@state_count + 1
-          constr_i.setName(constr_i_name)
-        end
+        constr_i_name = replace_ems_special_characters(construction.nameString) + 'State' + @@state_count.to_s
+        @@state_count = @@state_count + 1
+        constr_i.setName(constr_i_name)
 
         # loop through the actuators and set the appropriate window state
         actuator_names.each do |act_name|

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/ventcool/control.rb

@@ -85,7 +85,7 @@ module Honeybee
         in_var.setKeyValue(os_zone_name)
       end
       in_air_temp = OpenStudio::Model::EnergyManagementSystemSensor.new(openstudio_model, in_var)
-      in_sensor_name = replace_ems_special_characters(os_zone_name) + '_Sensor' + @@sensor_count.to_s
+      in_sensor_name = replace_ems_special_characters(os_zone_name) + 'Sensor' + @@sensor_count.to_s
       @@sensor_count = @@sensor_count + 1
       in_air_temp.setName(in_sensor_name)
 
@@ -97,7 +97,7 @@ module Honeybee
           sch_var.setReportingFrequency('Timestep')
           sch_var.setKeyValue(@hash[:schedule])
           sch_sens = OpenStudio::Model::EnergyManagementSystemSensor.new(openstudio_model, sch_var)
-          sch_sensor_name = replace_ems_special_characters(os_zone_name) + '_Sensor' + @@sensor_count.to_s
+          sch_sensor_name = replace_ems_special_characters(os_zone_name) + 'Sensor' + @@sensor_count.to_s
           @@sensor_count = @@sensor_count + 1
           sch_sens.setName(sch_sensor_name)
         end
@@ -108,14 +108,11 @@ module Honeybee
       vent_opening_surfaces.each do |vent_srf|
         window_act = OpenStudio::Model::EnergyManagementSystemActuator.new(
             vent_srf, 'AirFlow Network Window/Door Opening', 'Venting Opening Factor')
-        vent_srf_name = vent_srf.name
-        unless vent_srf_name.empty?
-          act_name = replace_ems_special_characters(vent_srf_name.get) + \
-            '_OpenFactor' + @@actuator_count.to_s
-            @@actuator_count = @@actuator_count + 1
-          window_act.setName(act_name)
-          actuator_names << act_name
-        end
+        act_name = replace_ems_special_characters(vent_srf.nameString) + \
+          'OpenFactor' + @@actuator_count.to_s
+          @@actuator_count = @@actuator_count + 1
+        window_act.setName(act_name)
+        actuator_names << act_name
       end
 
       # create the first line of the EMS Program to open each window according to the control logic
@@ -158,7 +155,7 @@ module Honeybee
 
       # initialize the program and add the complete logic
       ems_program = OpenStudio::Model::EnergyManagementSystemProgram.new(openstudio_model)
-      prog_name = replace_ems_special_characters(os_zone_name) + '_WindowOpening' + @@program_count.to_s
+      prog_name = replace_ems_special_characters(os_zone_name) + 'WindowOpening' + @@program_count.to_s
       @@program_count = @@program_count + 1
       ems_program.setName(prog_name)
       ems_program.addLine(complete_logic)

metadata

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