honeybee-openstudio 2.0.1 → 2.3.0

data/lib/from_honeybee/schedule/ruleset.rb

@@ -58,10 +58,23 @@ module FromHoneybee
       os_sch_ruleset = OpenStudio::Model::ScheduleRuleset.new(openstudio_model)
       os_sch_ruleset.setName(@hash[:identifier])
 
+      # assign schedule type limit
+      sch_type_limit_obj = nil
+      if @hash[:schedule_type_limit]
+        schedule_type_limit = openstudio_model.getScheduleTypeLimitsByName(@hash[:schedule_type_limit])
+        unless schedule_type_limit.empty?
+          sch_type_limit_obj = schedule_type_limit.get
+          os_sch_ruleset.setScheduleTypeLimits(sch_type_limit_obj)
+        end
+      end
+
       # loop through day schedules and create openstudio schedule day object
       @hash[:day_schedules].each do |day_schedule|
         day_schedule_new = OpenStudio::Model::ScheduleDay.new(openstudio_model)
         day_schedule_new.setName(day_schedule[:identifier])
+        unless sch_type_limit_obj.nil?
+          day_schedule_new.setScheduleTypeLimits(sch_type_limit_obj)
+        end
         values_day_new = day_schedule[:values]
         times_day_new = day_schedule[:times]
         times_day_new.delete_at(0)  # Remove [0, 0] from array at index 0.
@@ -112,15 +125,6 @@ module FromHoneybee
           os_sch_ruleset.defaultDaySchedule.addValue(times[i], values[i])
         end
       end
-      
-      # assign schedule type limit
-      if @hash[:schedule_type_limit]
-        schedule_type_limit = openstudio_model.getScheduleTypeLimitsByName(@hash[:schedule_type_limit])
-        unless schedule_type_limit.empty?
-          schedule_type_limit_object = schedule_type_limit.get
-          os_sch_ruleset.setScheduleTypeLimits(schedule_type_limit_object)
-        end
-      end
 
       # assign schedule rules
       if @hash[:schedule_rules]

data/lib/from_honeybee/simulation/extension.rb

@@ -39,7 +39,7 @@ module FromHoneybee
     @@schema = nil
 
     def schema_file
-      File.join(@lib_dir, 'from_honeybee', '_openapi', 'simulation-parameter.json')
+      File.join(@lib_dir, 'from_honeybee', '_defaults', 'simulation-parameter.json')
     end
 
   end

data/lib/from_honeybee/simulation/parameter.rb

@@ -244,7 +244,6 @@ module FromHoneybee
           begin
             os_report = @openstudio_model.getOutputTableSummaryReports
           rescue  # REMOVE: Once the upgrade to OpenStudio 3.0 is official
-            os_report = OpenStudio::Model::OutputTableSummaryReports.new(@openstudio_model)
           end
           @hash[:output][:summary_reports].each do |report|
             begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeybee-openstudio
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Tanushree Charan
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2020-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -165,12 +165,14 @@ files:
 - lib/files/honeybee_workflow.osw
 - lib/files/urbanopt_Gemfile
 - lib/from_honeybee.rb
-- lib/from_honeybee/_openapi/model.json
-- lib/from_honeybee/_openapi/simulation-parameter.json
+- lib/from_honeybee/_defaults/energy_default.json
+- lib/from_honeybee/_defaults/model.json
+- lib/from_honeybee/_defaults/simulation-parameter.json
 - lib/from_honeybee/construction/air.rb
 - lib/from_honeybee/construction/opaque.rb
 - lib/from_honeybee/construction/shade.rb
 - lib/from_honeybee/construction/window.rb
+- lib/from_honeybee/construction/windowshade.rb
 - lib/from_honeybee/construction_set.rb
 - lib/from_honeybee/extension.rb
 - lib/from_honeybee/geometry/aperture.rb