honeybee-openstudio 2.18.0 → 2.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe82ab879bf620ce30c665948e97a2b078e8b3c5899cbecea1ae0cc0b319c80e
-  data.tar.gz: c86bad1a3e7fe7a0c7e8ccbe2900774a561a46056dae0450ed2998d2e29213b4
+  metadata.gz: 360f33826c9c5ac0030753392e25e8c49b9be52b68ec03da684fd20503c3e1f8
+  data.tar.gz: b8d57eab2e20d6dcb19220dcca07091ffc768bd1686fa6f156a013fa5470b863
 SHA512:
-  metadata.gz: a86ca8992989da3f1f4a5642b55ece1c920e0378a82d8bf55e6362546375cc9fb66f1d0d4e69e74c3803678a77c168b87b733f58a2851b2eafebac0db4386190
-  data.tar.gz: 67740da44c34b3408f248a7be3d6a02fb1c9c76524dec2a7cf9fda9755ee923baa443f5f65b136c0d0fcb4d7ca956a8ffe9130715b1369f3413a7534ad34f88f
+  metadata.gz: 39d194113026357c05405ee505e7f4b39711fd6cf45536195aa515fff2a7cc6dbfb22592fac28fb6c359c5e1458573697723377348be1bf90034fbf7df7262cc
+  data.tar.gz: 95fcfdd2b144d870cebbe2e88bf2a3a139b9ae93c9fa2c0906eee93870e4d280472639ecaf19fcbd8188d09af5866e62f9f8c9f34e84717439b0fcce95a70d5a

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.18.0'
+  spec.version       = '2.18.1'
   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/aperture.rb

@@ -71,7 +71,10 @@ module Honeybee
 
       construction = sub_surface.construction
       if !construction.empty?
-        hash[:construction] = construction.get.nameString
+        constr_id = construction.get.nameString
+        unless $window_constructions[constr_id].nil?
+          hash[:construction] = constr_id
+        end
       end
 
       hash

data/lib/from_openstudio/geometry/door.rb

@@ -71,7 +71,12 @@ module Honeybee
 
       construction = sub_surface.construction
       if !construction.empty?
-        hash[:construction] = construction.get.nameString
+        constr_id = 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?
+          hash[:construction] = constr_id
+        end
       end
 
       hash

data/lib/from_openstudio/geometry/face.rb

@@ -73,7 +73,10 @@ module Honeybee
 
       construction = surface.construction
       if !construction.empty?
-        hash[:construction] = construction.get.nameString
+        constr_id = construction.get.nameString
+        unless $opaque_constructions[constr_id].nil?
+          hash[:construction] = constr_id
+        end
       end
 
       hash

data/lib/from_openstudio/geometry/shade.rb

@@ -63,10 +63,10 @@ module Honeybee
       if !construction.empty?
         const_name = construction.get.nameString
         hash[:construction] = const_name
-        unless $shade_construction.has_key?(const_name)
+        unless $shade_constructions.has_key?(const_name)
           const_obj = construction.get
           const = const_obj.to_LayeredConstruction.get
-          $shade_construction[const_name] = const
+          $shade_constructions[const_name] = const
         end
       end
 

data/lib/from_openstudio/model.rb

@@ -61,8 +61,10 @@ module Honeybee
       hash[:tolerance] = 0.01
       hash[:angle_tolerance] = 1.0
 
-      # Hash for all shade constructions in the model
-      $shade_construction = {}
+      # Hashes for all constructions in the model
+      $opaque_constructions = {}
+      $window_constructions = {}
+      $shade_constructions = {}
       hash[:properties] = properties_from_model(openstudio_model)
 
       rooms = rooms_from_model(openstudio_model)
@@ -71,8 +73,8 @@ module Honeybee
       orphaned_shades = orphaned_shades_from_model(openstudio_model)
       hash[:orphaned_shades] = orphaned_shades if !orphaned_shades.empty?
 
-      unless $shade_construction.empty?
-        shade_constructions_from_model($shade_construction).each do |shade_const|
+      unless $shade_constructions.empty?
+        shade_constructions_from_model($shade_constructions).each do |shade_const|
           hash[:properties][:energy][:constructions] << shade_const
         end
       end
@@ -215,16 +217,22 @@ module Honeybee
         window_construction = false
         opaque_construction = false
         material = construction.layers[0]
-        if material.to_StandardGlazing.is_initialized or material.to_SimpleGlazing.is_initialized
-          window_construction = true
-        elsif material.to_StandardOpaqueMaterial.is_initialized or material.to_MasslessOpaqueMaterial.is_initialized
-          opaque_construction = true
-        end
-        if window_construction == true
-          result << WindowConstructionAbridged.from_construction(construction)
-        end
-        if opaque_construction == true
-          result << OpaqueConstructionAbridged.from_construction(construction)
+        unless material.nil?
+          if material.to_StandardGlazing.is_initialized or material.to_SimpleGlazing.is_initialized
+            window_construction = true
+          elsif material.to_StandardOpaqueMaterial.is_initialized or material.to_MasslessOpaqueMaterial.is_initialized
+            opaque_construction = true
+          end
+          if window_construction == true
+            constr_hash = WindowConstructionAbridged.from_construction(construction)
+            $window_constructions[constr_hash[:identifier]] = constr_hash
+            result << constr_hash
+          end
+          if opaque_construction == true
+            constr_hash = OpaqueConstructionAbridged.from_construction(construction)
+            $opaque_constructions[constr_hash[:identifier]] = constr_hash
+            result << constr_hash
+          end
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeybee-openstudio
 version: !ruby/object:Gem::Version
-  version: 2.18.0
+  version: 2.18.1
 platform: ruby
 authors:
 - Tanushree Charan
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-12 00:00:00.000000000 Z
+date: 2021-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler