honeybee-openstudio 2.17.0 → 2.17.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7763ae7887c7a6892971eb20201e8647ef17c9b22b80c49d7b1435c2aac0ff6b
-  data.tar.gz: 576732a27fe86e31e8a8b6d843bcf0b2f491004220c2197ab98e3537cbebffe1
+  metadata.gz: f4856942358fea802404323b2df581961230c29b0de01d1993742dc2e9c4aaec
+  data.tar.gz: 5749259754899e511dd53f3cb4427986abc78bfb6de7f6af023829db9056c630
 SHA512:
-  metadata.gz: 59d9b699742b416d5c7ed92662d78ba5cd0e8890d771eeac24bb9653fca20405321b99402f1b0f91263a2f04ec3a4acb63f3b4e0bc29ae2bbcb772479f8cf005
-  data.tar.gz: 7a0adabbda9462db16787842ca097b49235b08ed9dfaf3b1ec778242ab21cc6781cc10e7d8278c3e2c078ec64a66eb2cb34ce2ec47927a5b688072e7230d1ec8
+  metadata.gz: 573e2448b710a5591c2b2c648d96d6ee09b226a458b589d3a081f6ba1dd5a04cf42ac84f9e63b43bcfa77c09c54632b08d9c3391b14f502c447de9f18a1ffa72
+  data.tar.gz: 855685ea4d3387be760c97ca56a807bdd6a983be4a528a177784f52cbca182a5d5561eaed9c4ab0a3de71631ddf4633de79174d6bf421ef8c0094a531ca5a566

data/README.md

@@ -7,7 +7,6 @@
 
 Library and measures for translating between Honeybee JSON schema and OpenStudio Model schema (OSM).
 
-
 ## Run the measures of this repo using OpenStudio CLI
 
 Running the measures using OpenStudio CLI requires no installation other than cloning
@@ -42,8 +41,8 @@ where the items in parentheses should be replaced with specific file paths:
 
 ```
 
-
 ## Local Development
+
 1. Clone this repo locally
 ```
 git clone git@github.com:ladybug-tools/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.17.0'
+  spec.version       = '2.17.5'
   spec.authors       = ['Tanushree Charan', 'Dan Macumber', 'Chris Mackey', 'Mostapha Sadeghipour Roudsari']
   spec.email         = ['tanushree.charan@nrel.gov', 'chris@ladybug.tools']
 

data/lib/files/urbanopt_Gemfile

@@ -1,15 +1,23 @@
 source 'http://rubygems.org'
 
-ruby '~> 2.5.0'
+ruby '~> 2.7.0'
 
 allow_local = ENV['FAVOR_LOCAL_GEMS']
 
+if allow_local && File.exist?('../openstudio-common-measures-gem')
+  gem 'openstudio-common-measures', path: '../openstudio-common-measures-gem'
+elsif allow_local
+  gem 'openstudio-common-measures', github: 'NREL/openstudio-common-measures-gem', branch: 'develop'
+else
+  gem 'openstudio-common-measures', '~> 0.4.0'
+end
+
 if allow_local && File.exist?('../openstudio-model-articulation-gem')
   gem 'openstudio-model-articulation', path: '../openstudio-model-articulation-gem'
 elsif allow_local
   gem 'openstudio-model-articulation', github: 'NREL/openstudio-model-articulation-gem', branch: 'develop'
 else
-  gem 'openstudio-model-articulation', '0.3.1'
+  gem 'openstudio-model-articulation', '0.4.0'
 end
 
 if allow_local && File.exist?('../urbanopt-geojson-gem')
@@ -17,7 +25,7 @@ if allow_local && File.exist?('../urbanopt-geojson-gem')
 elsif allow_local
   gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop'
 else
-  gem 'urbanopt-geojson', '~> 0.5.0'
+  gem 'urbanopt-geojson', '~> 0.6.1'
 end
 
 if allow_local && File.exist?('../urbanopt-reporting-gem')
@@ -25,8 +33,8 @@ if allow_local && File.exist?('../urbanopt-reporting-gem')
 elsif allow_local
   gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop'
 else
-  gem 'urbanopt-reporting', '~> 0.3.2'
+  gem 'urbanopt-reporting', '~> 0.4.0'
 end
 
 # include the honeybee-openstudio-gem
-gem 'honeybee-openstudio', '2.16.4'
+gem 'honeybee-openstudio', '2.17.0'

data/lib/from_openstudio/geometry/face.rb

@@ -108,7 +108,7 @@ module Honeybee
 
     def self.boundary_condition_from_surface(surface)
       result = {}
-      surface_type = surface.surfaceType
+      surface_bc = surface.outsideBoundaryCondition
       adjacent_surface = surface.adjacentSurface
       if !adjacent_surface.empty?
         adjacent_space = clean_identifier(adjacent_surface.get.space.get.nameString)
@@ -116,7 +116,7 @@ module Honeybee
         result = {type: 'Surface', boundary_condition_objects: [adjacent_surface, adjacent_space]}
       elsif surface.isGroundSurface
         result = {type: 'Ground'}
-      elsif surface_type == 'Adiabatic'
+      elsif surface_bc == 'Adiabatic'
         result = {type: 'Adiabatic'}
       else
         sun_exposure = (surface.sunExposure == 'SunExposed')

data/lib/from_openstudio/model.rb

@@ -81,7 +81,15 @@ module Honeybee
       translator = OpenStudio::GbXML::GbXMLReverseTranslator.new
       openstudio_model = translator.loadModel(file)
       raise "Cannot load gbXML file at '#{}'" if openstudio_model.empty?
-      self.translate_from_openstudio(openstudio_model.get)
+      # remove any shade groups that were translated as spaces
+      os_model = openstudio_model.get
+      spaces = os_model.getSpaces()
+      spaces.each do |space|
+        if space.surfaces.length() == 0
+          space.remove()
+        end
+      end
+      self.translate_from_openstudio(os_model)
     end
 
     # Create Ladybug Energy Model JSON from IDF file

data/lib/measures/from_honeybee_model/measure.rb

@@ -34,6 +34,9 @@
 
 require 'to_openstudio'
 
+require 'fileutils'
+require 'pathname'
+
 # start the measure
 class FromHoneybeeModel < OpenStudio::Measure::ModelMeasure
   # human readable name
@@ -96,6 +99,7 @@ class FromHoneybeeModel < OpenStudio::Measure::ModelMeasure
     honeybee_model = Honeybee::Model.read_from_disk(model_json)
 
     if schedule_csv_dir && !schedule_csv_dir.empty?
+      schedule_csv_dir = Pathname.new(schedule_csv_dir).cleanpath
       if !Dir.exist?(schedule_csv_dir)
         runner.registerError("Directory for exported CSV Schedules does not exist '#{schedule_csv_dir}'")
         return false
@@ -106,6 +110,18 @@ class FromHoneybeeModel < OpenStudio::Measure::ModelMeasure
     STDOUT.flush
     honeybee_model.to_openstudio_model(model)
     STDOUT.flush
+
+    generated_files_dir = "#{runner.workflow.absoluteRootDir}/generated_files"
+    if schedule_csv_dir && !schedule_csv_dir.empty?
+      if Dir.exist?(schedule_csv_dir)
+        runner.registerInfo("Copying exported schedules from '#{schedule_csv_dir}' to '#{generated_files_dir}'")
+        FileUtils.mkdir_p(generated_files_dir)
+        Dir.glob("#{schedule_csv_dir}/*.csv").each do |file|
+          FileUtils.cp(file, generated_files_dir)
+        end
+      end
+    end
+
     return true
   end
 end

data/lib/measures/from_honeybee_model_to_gbxml/measure.rb

@@ -90,6 +90,13 @@ class FromHoneybeeModelToGbxml < OpenStudio::Measure::ModelMeasure
     os_model = honeybee_model.to_openstudio_model(model)
     STDOUT.flush
 
+    # make sure the zone name is different from the space name to comply with gbXML
+    zones = os_model.getThermalZones()
+    zones.each do |zone|
+      zone_name = zone.name.to_s + '_Zone'
+      zone.setName(zone_name)
+    end
+
     # convert the OpenStudio model into a gbXML Model
     output_file_path = runner.getStringArgumentValue('output_file_path', user_arguments)
     if output_file_path && !output_file_path.empty?

data/lib/to_openstudio/model.rb

@@ -49,6 +49,13 @@ module Honeybee
           end
           file.puts row.join(',')
         end
+
+        # make sure data is written to the disk one way or the other
+        begin
+          file.fsync
+        rescue
+          file.flush
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeybee-openstudio
 version: !ruby/object:Gem::Version
-  version: 2.17.0
+  version: 2.17.5
 platform: ruby
 authors:
 - Tanushree Charan
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler