honeybee-openstudio 2.31.2 → 2.31.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddf8c7c7b9acf4094ea3a7702932246a6423fab131d5a2586b02421a81d24c16
-  data.tar.gz: a92d03dc75bd2c562ef5bf63cf6c4f69ecf515cbe36ca3df8f4ac36abf31b92a
+  metadata.gz: c847b160e1187c597ff518d513e30b259c15b069d5023e34cf7167aecdad270f
+  data.tar.gz: 8776b858a13b15deff5ceabc6738ab851915d28875fd539fc081b035fe4a9c46
 SHA512:
-  metadata.gz: d0fe77822120f793df5d5ed31c6d91a8ba601a9af26f6a84f21e1a618a4ef97b78b2477fc26ae99bc46894e3df708725c1c2d76497df3601f9e7c01e1920f6c1
-  data.tar.gz: a1853e96f594d0329126e5529f87fc3694b1d8a044bb995e38831ddbd72d89af94e81a065f0dc7909be5b5b764e998dcdebfd3bcf3db4ae7da394bdd3a8ee5c6
+  metadata.gz: c13aaea4ba8a471519a7ef3971ac07dbe16a24c07420af232e68ba6f0845557bc48b726aad9ef2e2bdba5e55fe8713aaf14516af1a82f1e24edf9ee75e5d58b8
+  data.tar.gz: d0b1b82283d64f41247b4cac1263f98ef74e909b556534779b2cff42d014c86ec3587a9bbafbbce0d5e09673858d593e1a90c9ede3da79d44bfe1e18c355b8da

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

data/lib/from_openstudio/geometry/room.rb

@@ -85,7 +85,8 @@ module Honeybee
         space_type = space.spaceType.get
         hash[:program_type] = space_type.nameString
       end
-      # TODO: These are loads assigned to the space directly. How should duplicates created in programtype, if any, be handled? 
+      # TODO: These are only loads assigned to the space directly.
+      # Duplicates and other definitions created in programtype should be summed 
       unless space.people.empty?
         space.people.each do |people|
           people_def = people.peopleDefinition
@@ -100,6 +101,7 @@ module Honeybee
           end
         end
       end
+
       unless space.lights.empty?
         space.lights.each do |light|
           light_def = light.lightsDefinition
@@ -114,6 +116,7 @@ module Honeybee
           end
         end
       end
+
       unless space.electricEquipment.empty?
         space.electricEquipment.each do |electric_eq|
           electric_eq_def = electric_eq.electricEquipmentDefinition
@@ -128,6 +131,7 @@ module Honeybee
           end
         end
       end
+
       unless space.gasEquipment.empty?
         space.gasEquipment.each do |gas_eq|
           gas_eq_def = gas_eq.gasEquipmentDefinition
@@ -142,18 +146,7 @@ module Honeybee
           end
         end
       end
-      unless space.otherEquipment.empty?
-        hash[:process_loads] = []
-        space.otherEquipment.each do |other_eq|
-          other_eq_def = other_eq.otherEquipmentDefinition
-          if !other_eq_def.designLevel.empty? && !other_eq.schedule.empty?
-            sch = other_eq.schedule.get
-            if sch.to_ScheduleRuleset.is_initialized or sch.to_ScheduleFixedInterval.is_initialized
-              hash[:process_loads] << Honeybee::ProcessAbridged.from_load(other_eq)
-            end
-          end
-        end
-      end
+
       unless space.spaceInfiltrationDesignFlowRates.empty?
         space.spaceInfiltrationDesignFlowRates.each do |infiltration|
           # Only translate if flow per exterior area is specified
@@ -167,17 +160,41 @@ module Honeybee
           end
         end
       end
+
+      unless space.waterUseEquipment.empty?
+        space.waterUseEquipment.each do |shw_equipment|
+          # Check if schedule exists and is of the correct type
+          unless shw_equipment.flowRateFractionSchedule.empty?
+            sch = shw_equipment.flowRateFractionSchedule.get
+            if sch.to_ScheduleRuleset.is_initialized or sch.to_ScheduleFixedInterval.is_initialized
+              floor_area = space.floorArea  # Get floor area 
+              hash[:service_hot_water] = Honeybee::ServiceHotWaterAbridged.from_load(shw_equipment, floor_area)
+            end
+          end
+        end
+      end
+
       unless space.designSpecificationOutdoorAir.empty?
         hash[:ventilation] = Honeybee::VentilationAbridged.from_load(space.designSpecificationOutdoorAir.get)
       end
+
+      unless space.otherEquipment.empty?
+        hash[:process_loads] = []
+        space.otherEquipment.each do |other_eq|
+          other_eq_def = other_eq.otherEquipmentDefinition
+          if !other_eq_def.designLevel.empty? && !other_eq.schedule.empty?
+            sch = other_eq.schedule.get
+            if sch.to_ScheduleRuleset.is_initialized or sch.to_ScheduleFixedInterval.is_initialized
+              hash[:process_loads] << Honeybee::ProcessAbridged.from_load(other_eq)
+            end
+          end
+        end
+      end
+
       unless space.daylightingControls.empty?
         hash[:daylighting_control] = Honeybee::DaylightingControl.from_load(space.daylightingControls[0])
       end
-      unless space.waterUseEquipment.empty?
-        # Get floor area 
-        floor_area = space.floorArea
-        hash[:service_hot_water] = Honeybee::ServiceHotWaterAbridged.from_load(space.waterUseEquipment[0], floor_area)
-      end
+     
       thermal_zone = space.thermalZone
       unless thermal_zone.empty?
         thermal_zone = space.thermalZone.get

data/lib/from_openstudio/load/service_hot_water.rb

@@ -41,17 +41,14 @@ module Honeybee
             hash[:type] = 'ServiceHotWaterAbridged'
             # set hash values from OpenStudio Object
             hash[:identifier] = clean_name(load.nameString)
-            load_def = load.WaterUseEquipmentDefinition
+            load_def = load.waterUseEquipmentDefinition
             # units of peak flow rate are m3/s
             peak_flow = load_def.peakFlowRate
             # unit for flow per area is L/h-m2 (m3/s = 3600000 L/h)
-            hash[:flow_per_area] = (peak_flow * 3600000)/floor_area
-            unless load_def.flowRateFractionSchedule.empty?
-                sch = load_def.flowRateFractionSchedule
-                # Translate only Scheudle Ruleset and Schedule Fixed Interval
-                if sch.to_ScheduleRuleset.is_initialized or sch.to_ScheduleFixedInterval.is_initialized
-                    hash[:schedule] = load_def.flowRateFractionSchedule.get.nameString
-                end
+            hash[:flow_per_area] = (peak_flow * 3600000) / floor_area
+            unless load.flowRateFractionSchedule.empty? 
+                schedule = load.flowRateFractionSchedule.get
+                hash[:schedule] = schedule.nameString
             end
 
             hash

data/lib/honeybee/model.rb

@@ -52,6 +52,7 @@ module Honeybee
       @@extension ||= Extension.new
       @@schema ||= @@extension.schema
       @@standards ||= @@extension.standards
+      $triangulate_sub_faces = false
       $simple_window_cons = false
 
       @hash = hash

data/lib/to_openstudio/geometry/aperture.rb

@@ -54,7 +54,7 @@ module Honeybee
       final_vertices_list = []
       matching_os_subsurfaces = []
       matching_os_subsurface_indices = []
-      if os_vertices.size > 4
+      if $triangulate_sub_faces && os_vertices.size > 4
 
         # if this apeture has a matched apeture, see if the other one has already been created
         # the matched apeture should have been converted to multiple subsurfaces

data/lib/to_openstudio/geometry/door.rb

@@ -54,7 +54,7 @@ module Honeybee
       final_vertices_list = []
       matching_os_subsurfaces = []
       matching_os_subsurface_indices = []
-      if os_vertices.size > 4
+      if $triangulate_sub_faces && os_vertices.size > 4
 
         # if this door has a matched door, see if the other one has already been created
         # the matched door should have been converted to multiple subsurfaces

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeybee-openstudio
 version: !ruby/object:Gem::Version
-  version: 2.31.2
+  version: 2.31.4
 platform: ruby
 authors:
 - Tanushree Charan