honeybee-openstudio 2.32.0 → 2.32.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1927df270811214605f2db5ed8f390dfff4213b4b8e749c6049ddf074a8be94d
-  data.tar.gz: 0b01e83fac83f8e9950627ce130fbfbb194288230fd2c36c11f6d3b988fb2e34
+  metadata.gz: b1a0e49c9d5045c2b09cc0f0fbe3bd964fb4251e077eb2bd27db6bedcfcf39cd
+  data.tar.gz: 967f9557a5238c899c9af5214158b63f4bd9dff66074cc309bb4d3f9c59ee72a
 SHA512:
-  metadata.gz: 672dc0bca8b45b6cf45f0af19225d86ee828ecc27c62c65d8231627ef6c0ddb677cc32a8d2c4b3364fbe51eacbbc4bdcfa84b7d3dc129b6941e8fec0416f1c0c
-  data.tar.gz: 20c019e91bbf78bd27c009d48db0305b5bfc0cf97f7e80868c54172e0d8409a83b892ed41b806c6225fcd77a2a8376b5a01f0cd08958d27c3bcbf96fd9c3851e
+  metadata.gz: bf2aeec6148a31263db088720abf68dc914002d5fefb73c6ac24e599d79a148f763c4bda05d96eabaf9968ccb35519b707cb52febc84f3d7ffa8acb0924b27c6
+  data.tar.gz: 2ceb1977685d6b3b6fe4bc1edb69029906795d4a2f3541ecdb25226c3cc3068101c20b9dfa154a4795f5f490560717dad5e1230f41ff164fb235ba2415b4a353

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

data/lib/to_openstudio/schedule/ruleset.rb

@@ -61,12 +61,16 @@ module Honeybee
       end
 
       # loop through day schedules and create openstudio schedule day object
+      day_schs = Hash.new
       def_day_id = @hash[:default_day_schedule]
       def_day_hash = nil
       @hash[:day_schedules].each do |day_schedule|
         if day_schedule[:identifier] != def_day_id
           day_schedule_new = OpenStudio::Model::ScheduleDay.new(openstudio_model)
-          day_schedule_new.setName(day_schedule[:identifier])
+          exist_sch = openstudio_model.getScheduleDayByName(day_schedule[:identifier])
+          if exist_sch.empty?  # make sure we don't overwrite an existing schedule day
+            day_schedule_new.setName(day_schedule[:identifier])
+          end
           unless @hash[:display_name].nil?
             day_schedule_new.setDisplayName(@hash[:display_name])
           end
@@ -81,53 +85,55 @@ module Honeybee
             time_until = OpenStudio::Time.new(0, times_day_new[i][0], times_day_new[i][1], 0)
             day_schedule_new.addValue(time_until, values_day_new[i])
           end
+          day_schs[day_schedule[:identifier]] = day_schedule_new
         else
           def_day_hash = day_schedule
         end
       end
 
+      # assign default day schedule
+      def_day_sch = os_sch_ruleset.defaultDaySchedule
+      exist_sch = openstudio_model.getScheduleDayByName(def_day_id)
+      if exist_sch.empty?  # make sure we don't overwrite an existing schedule day
+        def_day_sch.setName(def_day_id)
+      end
+      unless sch_type_limit_obj.nil?
+        def_day_sch.setScheduleTypeLimits(sch_type_limit_obj)
+      end
+      values_day_new = def_day_hash[:values]
+      times_day_new = def_day_hash[:times]
+      times_day_new.delete_at(0)  # Remove [0, 0] from array at index 0.
+      times_day_new.push([24, 0])  # Add [24, 0] at index 0
+      values_day_new.each_index do |i|
+        time_until = OpenStudio::Time.new(0, times_day_new[i][0], times_day_new[i][1], 0)
+        def_day_sch.addValue(time_until, values_day_new[i])
+      end
+      day_schs[def_day_id] = def_day_sch
+
       # assign holiday schedule
       if @hash[:holiday_schedule]
-        holiday_schedule = openstudio_model.getScheduleDayByName(@hash[:holiday_schedule])
-        unless holiday_schedule.empty?
-          holiday_schedule_object = holiday_schedule.get
-          os_sch_ruleset.setHolidaySchedule(holiday_schedule_object)
+        holiday_schedule = day_schs[@hash[:holiday_schedule]]
+        unless holiday_schedule.nil?
+          os_sch_ruleset.setHolidaySchedule(holiday_schedule)
         end
       end
 
       # assign summer design day schedule
       if @hash[:summer_designday_schedule]
-        summer_design_day = openstudio_model.getScheduleDayByName(@hash[:summer_designday_schedule])
-        unless summer_design_day.empty?
-          summer_design_day_object = summer_design_day.get
-          os_sch_ruleset.setSummerDesignDaySchedule(summer_design_day_object)
+        summer_design_day = day_schs[@hash[:summer_designday_schedule]]
+        unless summer_design_day.nil?
+          os_sch_ruleset.setSummerDesignDaySchedule(summer_design_day)
         end
       end
 
       # assign winter design day schedule
       if @hash[:winter_designday_schedule]
-        winter_design_day = openstudio_model.getScheduleDayByName(@hash[:winter_designday_schedule])
-        unless winter_design_day.empty?
-          winter_design_day_object = winter_design_day.get
-          os_sch_ruleset.setWinterDesignDaySchedule(winter_design_day_object)
+        winter_design_day = day_schs[@hash[:winter_designday_schedule]]
+        unless winter_design_day.nil?
+          os_sch_ruleset.setWinterDesignDaySchedule(winter_design_day)
         end
       end
 
-      # assign default day schedule
-      def_day_sch = os_sch_ruleset.defaultDaySchedule
-      def_day_sch.setName(def_day_id)
-      unless sch_type_limit_obj.nil?
-        def_day_sch.setScheduleTypeLimits(sch_type_limit_obj)
-      end
-      values_day_new = def_day_hash[:values]
-      times_day_new = def_day_hash[:times]
-      times_day_new.delete_at(0)  # Remove [0, 0] from array at index 0.
-      times_day_new.push([24, 0])  # Add [24, 0] at index 0
-      values_day_new.each_index do |i|
-        time_until = OpenStudio::Time.new(0, times_day_new[i][0], times_day_new[i][1], 0)
-        def_day_sch.addValue(time_until, values_day_new[i])
-      end
-
       # assign schedule rules
       if @hash[:schedule_rules]
         @hash[:schedule_rules].each do |rule|
@@ -145,12 +151,10 @@ module Honeybee
           openstudio_schedule_rule.setStartDate(start_date)
           openstudio_schedule_rule.setEndDate(end_date)
 
-          schedule_rule_day = openstudio_model.getScheduleDayByName(rule[:schedule_day])
-          unless schedule_rule_day.empty?
-            schedule_rule_day_object = schedule_rule_day.get
-
-            values_day = schedule_rule_day_object.values
-            times_day = schedule_rule_day_object.times
+          schedule_rule_day = day_schs[rule[:schedule_day]]
+          unless schedule_rule_day.nil?
+            values_day = schedule_rule_day.values
+            times_day = schedule_rule_day.times
 
             values_day.each_index do |i|
               openstudio_schedule_rule.daySchedule.addValue(times_day[i], values_day[i])

metadata

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