honeybee-openstudio 2.20.6 → 2.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2523ccb4312d429799bdc8ee1d3eacb863dfd06665358b8dc67ab694fbd604b3
-  data.tar.gz: b122903b89c9188f7738509310c81adcd85916da48b74429922bf0d401ae4a8c
+  metadata.gz: eaf3a6516a194a5a4ff4207f1d10dcaf496f24152ee8f5077b739bd64422c816
+  data.tar.gz: 1c23f364bfd38a7c63eaf7af50b7364d0defa4abf851af6c54dbc61c0e739cf3
 SHA512:
-  metadata.gz: 51ae0fcd32d6d7e322ac5c5175b734d60df579ee70852fa75a3d7dc57d2ea9a602d43f4fb9f165d831fdd75b1dd56f1de5c566fb194f827fb4bbb2be0a6b7ce9
-  data.tar.gz: 66c32fa0c548848dd99cce39c48d013a60be882753ebef2e691aa6d2bec7bf3e42314631c6ccee861c89cce540a2e6a938e46af42fcab6d59bd211c7e60545e4
+  metadata.gz: 65899bcdebb34f6767e38da661c9adce0ea85b1906f384c1aabca3ae05df0c60fb875a7b1d4977e5496a8e5c4397ed6ce3efd88a2426f8c1e9c4430b50c477e0
+  data.tar.gz: 53db492a949af7fa1920526571f8d0a2068c5e13d615ac206d8cb9254e93f7d4ac74abc777e6e72e7ab02a2efaa0fdeb6eea3033515259bc49c53d2c4ff57e7f

data/.github/workflows/ci.yaml

@@ -69,4 +69,14 @@ jobs:
               "version" : "'$RELEASE_TAG'"
             }
           }' \
-          -u chriswmackey:$DEPS_TOKEN
+          -u ladybugbot:$DEPS_TOKEN
+      - name: Update honeybee-energy
+        if: contains(steps.new_release.outputs.tag, '.')
+        env:
+          DISPATCH_REPO: ladybug-tools/honeybee-energy
+          DEPS_TOKEN: ${{ secrets.DEPS_UPDATING }}
+        run: |
+          curl -X POST https://api.github.com/repos/$DISPATCH_REPO/dispatches \
+          -H "Accept: application/vnd.github.everest-preview+json" \
+          -d '{"event_type": "honeybee_openstudio_gem_release", "client_payload": {"version": "${{ steps.new_release.outputs.tag }}"}}' \
+          -u ladybugbot:$DEPS_TOKEN

data/README.md

@@ -1,7 +1,6 @@
 [![Build Status](https://github.com/ladybug-tools/honeybee-openstudio-gem/workflows/CI/badge.svg)](https://github.com/ladybug-tools/honeybee-openstudio-gem/actions)
-[![Coverage Status](https://coveralls.io/repos/github/ladybug-tools/honeybee-openstudio-gem/badge.svg?branch=master)](https://coveralls.io/github/ladybug-tools/honeybee-openstudio-gem)
 
-![Ruby 2.5](https://img.shields.io/badge/ruby-2.5-blue.svg)
+![Ruby 2.7](https://img.shields.io/badge/ruby-2.7-blue.svg)
 
 # honeybee-openstudio-gem
 

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

data/lib/from_openstudio.rb

@@ -35,6 +35,7 @@ require 'honeybee'
 # extend the compound objects that house the other objects
 require 'from_openstudio/model'
 require 'from_openstudio/model_object'
+require 'from_openstudio/construction_set'
 
 # extend the geometry objects
 require 'from_openstudio/geometry/aperture'

data/lib/from_openstudio/construction_set.rb

@@ -0,0 +1,138 @@
+# *******************************************************************************
+# Honeybee OpenStudio Gem, Copyright (c) 2020, Alliance for Sustainable
+# Energy, LLC, Ladybug Tools LLC and other contributors. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# (1) Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# (2) Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# (3) Neither the name of the copyright holder nor the names of any contributors
+# may be used to endorse or promote products derived from this software without
+# specific prior written permission from the respective party.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE
+# UNITED STATES GOVERNMENT, OR THE UNITED STATES DEPARTMENT OF ENERGY, NOR ANY OF
+# THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# *******************************************************************************
+
+require 'honeybee/construction_set'
+require 'from_openstudio/model_object'
+
+module Honeybee
+  class ConstructionSetAbridged < ModelObject
+
+    def self.from_construction_set(construction_set)
+        # create an empty hash
+        hash = {}
+        hash[:type] = 'ConstructionSetAbridged'
+        # set hash values from OpenStudio Object
+        hash[:identifier] = construction_set.nameString
+        hash[:wall_set] = {}
+        hash[:floor_set] = {}
+        hash[:aperture_set] = {}
+        hash[:door_set] = {}
+        hash[:roof_ceiling_set] = {}
+
+        # get interior surface constructions
+        unless construction_set.defaultInteriorSurfaceConstructions.empty?
+          int_surf_construction = construction_set.defaultInteriorSurfaceConstructions.get
+          # get interior wall construction
+          unless int_surf_construction.wallConstruction.empty?
+            int_wall_const = int_surf_construction.wallConstruction.get
+            hash[:wall_set][:interior_construction] = int_wall_const.nameString
+          end
+          # get interior floor construction
+          unless int_surf_construction.floorConstruction.empty?
+            int_floor_const = int_surf_construction.floorConstruction.get
+            hash[:floor_set][:interior_construction] = int_floor_const.nameString
+          end
+          # get interior roofceiling construction
+          unless int_surf_construction.roofCeilingConstruction.empty?
+            int_roof_const = int_surf_construction.roofCeilingConstruction.get
+            hash[:roof_ceiling_set][:interior_construction] = int_roof_const.nameString
+          end
+        end
+
+        # get interior subsurface constructions
+        unless construction_set.defaultInteriorSubSurfaceConstructions.empty?
+          int_subsurf_const = construction_set.defaultInteriorSubSurfaceConstructions.get
+          unless int_subsurf_const.fixedWindowConstruction.empty?
+            int_wind_const = int_subsurf_const.fixedWindowConstruction.get
+            hash[:aperture_set][:window_construction] = int_wind_const.nameString
+          end
+          # get interior door construction
+          unless int_subsurf_const.doorConstruction.empty?
+            int_door_const = int_subsurf_const.doorConstruction.get
+            hash[:door_set][:interior_construction] = int_door_const.nameString
+          end
+          # get interior glass door construction
+          unless int_subsurf_const.glassDoorConstruction.empty?
+            int_glass_door_const = int_subsurf_const.glassDoorConstruction.get
+            hash[:door_set][:interior_glass_construction] = int_glass_door_const.nameString
+          end
+        end
+        
+        # get exterior surface constructions
+        unless construction_set.defaultExteriorSurfaceConstructions.empty?
+          ext_surf_const = construction_set.defaultExteriorSurfaceConstructions.get
+          # get exterior wall construction
+          unless ext_surf_const.wallConstruction.empty?
+            ext_wall_const = ext_surf_const.wallConstruction.get
+            hash[:wall_set][:exterior_construction] = ext_wall_const.nameString
+          end
+          # get exterior floor construction
+          unless ext_surf_const.floorConstruction.empty?
+            ext_floor_const = ext_surf_const.floorConstruction.get
+            hash[:floor_set][:exterior_construction] = ext_floor_const.nameString
+          end
+          # get exterior roofceiling construction
+          unless ext_surf_const.roofCeilingConstruction.empty?
+            ext_roof_const = ext_surf_const.roofCeilingConstruction.get
+            hash[:roof_ceiling_set][:exterior_construction] = ext_roof_const.nameString
+          end
+        end
+
+        # get exterior subsurface construction
+        unless construction_set.defaultExteriorSubSurfaceConstructions.empty?
+          ext_subsurf_const = construction_set.defaultExteriorSubSurfaceConstructions.get
+          # get exterior operable window construction
+          unless ext_subsurf_const.operableWindowConstruction.empty?
+            ext_wind_const = ext_subsurf_const.operableWindowConstruction.get
+            hash[:aperture_set][:operable_construction] = ext_wind_const.nameString
+          end
+          # get exterior skylight construction
+          unless ext_subsurf_const.skylightConstruction.empty?
+            ext_skylight_const = ext_subsurf_const.skylightConstruction.get
+            hash[:aperture_set][:skylight_construction] = ext_skylight_const.nameString
+          end
+          # get exterior door construction
+          unless ext_subsurf_const.doorConstruction.empty?
+            ext_door_const = ext_subsurf_const.doorConstruction.get
+            hash[:door_set][:exterior_construction] = ext_door_const.nameString
+          end
+          # get exterior overhead door construction
+          unless ext_subsurf_const.overheadDoorConstruction.empty?
+            ext_ovhd_door_const = ext_subsurf_const.overheadDoorConstruction.get
+            hash[:door_set][:overhead_construction] = ext_ovhd_door_const.nameString
+          end
+        end
+
+        hash
+
+    end
+  end # ConstructionSetAbridged
+end # Honeybee

data/lib/from_openstudio/geometry/aperture.rb

@@ -69,11 +69,13 @@ module Honeybee
       hash = {}
       hash[:type] = 'ApertureEnergyPropertiesAbridged'
 
-      construction = sub_surface.construction
-      if !construction.empty?
-        constr_id = construction.get.nameString
-        unless $window_constructions[constr_id].nil?
-          hash[:construction] = constr_id
+      unless sub_surface.isConstructionDefaulted
+        construction = sub_surface.construction
+        if !construction.empty?
+          constr_id = construction.get.nameString
+          unless $window_constructions[constr_id].nil?
+            hash[:construction] = constr_id
+          end
         end
       end
 

data/lib/from_openstudio/geometry/door.rb

@@ -69,16 +69,18 @@ module Honeybee
       hash = {}
       hash[:type] = 'DoorEnergyPropertiesAbridged'
 
-      construction = sub_surface.construction
-      if !construction.empty?
-        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
+      unless sub_surface.isConstructionDefaulted
+        construction = sub_surface.construction
+        if !construction.empty?
+          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
       end
-
+      
       hash
     end
 

data/lib/from_openstudio/geometry/face.rb

@@ -71,11 +71,13 @@ module Honeybee
       hash = {}
       hash[:type] = 'FaceEnergyPropertiesAbridged'
 
-      construction = surface.construction
-      if !construction.empty?
-        constr_id = construction.get.nameString
-        unless $opaque_constructions[constr_id].nil?
-          hash[:construction] = constr_id
+      unless surface.isConstructionDefaulted
+        construction = surface.construction
+        if !construction.empty?
+          constr_id = construction.get.nameString
+          unless $opaque_constructions[constr_id].nil?
+            hash[:construction] = constr_id
+          end
         end
       end
 

data/lib/from_openstudio/geometry/shade.rb

@@ -59,14 +59,16 @@ module Honeybee
       hash = {}
       hash[:type] = 'ShadeEnergyPropertiesAbridged'
 
-      construction = shading_surface.construction
-      if !construction.empty?
-        const_name = construction.get.nameString
-        hash[:construction] = const_name
-        unless $shade_constructions.has_key?(const_name)
-          const_obj = construction.get
-          const = const_obj.to_LayeredConstruction.get
-          $shade_constructions[const_name] = const
+      unless shading_surface.isConstructionDefaulted
+        construction = shading_surface.construction
+        if !construction.empty?
+          const_name = construction.get.nameString
+          hash[:construction] = const_name
+          unless $shade_constructions.has_key?(const_name)
+            const_obj = construction.get
+            const = const_obj.to_LayeredConstruction.get
+            $shade_constructions[const_name] = const
+          end
         end
       end
 

data/lib/from_openstudio/model.rb

@@ -45,6 +45,7 @@ require 'from_openstudio/construction/air'
 require 'from_openstudio/construction/opaque'
 require 'from_openstudio/construction/window'
 require 'from_openstudio/construction/shade'
+require 'from_openstudio/construction_set'
 
 require 'openstudio'
 
@@ -65,6 +66,7 @@ module Honeybee
       $opaque_constructions = {}
       $window_constructions = {}
       $shade_constructions = {}
+
       hash[:properties] = properties_from_model(openstudio_model)
 
       rooms = rooms_from_model(openstudio_model)
@@ -127,7 +129,9 @@ module Honeybee
       hash[:constructions] = []
       hash[:constructions] = constructions_from_model(openstudio_model)
       hash[:materials] = materials_from_model(openstudio_model)
-      
+      hash[:construction_sets] = []
+      hash[:construction_sets] = constructionsets_from_model(openstudio_model)
+
       hash
     end
 
@@ -239,6 +243,19 @@ module Honeybee
       result
     end
 
+    # Create HB ConstructionSets from OpenStudio Construction Set
+    def self.constructionsets_from_model(openstudio_model)
+      result = []
+
+      openstudio_model.getDefaultConstructionSets.each do |construction_set|
+        if construction_set.nameString != "Default Generic Construction Set"
+          result << ConstructionSetAbridged.from_construction_set(construction_set)
+        end
+      end
+
+      result
+    end
+  
     def self.shade_constructions_from_model(shade_constructions)
       result = []
 

data/lib/honeybee/model_object.rb

@@ -100,7 +100,7 @@ module Honeybee
 
     # remove illegal characters in identifier
     def self.clean_identifier(str)
-      str.gsub(/[^.A-Za-z0-9_-] /, '_').gsub(' ', '_')
+      str.gsub(/[^.A-Za-z0-9_-] /, '_').gsub(' ', '_').gsub('{', '').gsub('}', '')
     end
 
 

data/lib/to_openstudio/construction_set.rb

@@ -140,6 +140,8 @@ module Honeybee
             @hash[:aperture_set][:window_construction])
           unless window_ref.empty?
             window_aperture = window_ref.get
+            #TODO: This looks wrong, it should be set to interior subsurface construction since
+            #window_construction apertures have a surface boundary condition.
             ext_subsurf_const.setFixedWindowConstruction(window_aperture)
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeybee-openstudio
 version: !ruby/object:Gem::Version
-  version: 2.20.6
+  version: 2.21.0
 platform: ruby
 authors:
 - Tanushree Charan
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-20 00:00:00.000000000 Z
+date: 2021-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -171,6 +171,7 @@ files:
 - lib/from_openstudio/construction/opaque.rb
 - lib/from_openstudio/construction/shade.rb
 - lib/from_openstudio/construction/window.rb
+- lib/from_openstudio/construction_set.rb
 - lib/from_openstudio/geometry/aperture.rb
 - lib/from_openstudio/geometry/door.rb
 - lib/from_openstudio/geometry/face.rb