honeybee-openstudio 2.7.5 → 2.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '059c1b63676053fb14b460d18b2f8cadab0ab7638a4632560861bf7e02b9db28'
-  data.tar.gz: 125278d93d4ef1ff13e9bf025154566cfce9b05d56474fd32037d840edba0510
+  metadata.gz: 544e602c7a0c32ac70d1b6635a3bd3dfec44d1b2e80e58833025c94f37fa98cf
+  data.tar.gz: 658f8b8062c2004bf3e5bc01505220482ca70ebf4a68aeb81ac74c71d6eb8d63
 SHA512:
-  metadata.gz: e5b62b5173f80a27a21d85eb565bf1546c779595dd5505d8b718aec5cceef98a9b1e017e70be302daf2a276cc083f51be6b7d379bd197658c7ef3dc181fb3245
-  data.tar.gz: 386187297eda2342a16bacc18bd33c804a50ce203a44983ee3f254ae192e6432fb19a96558b40e9e6fc8dd4f8a27da517c704ae5037e0d4c39eb9732208e999f
+  metadata.gz: 8d316bbfbeeba44c92915d1c76124ab510781e02ac053fd56f41b1a48aae60856a50b6c0f70aa0b3993ab46b18b0835624f50e809cb080219c98f18e24995ea4
+  data.tar.gz: 7fb71a158188765c0a858a6948ba30f85d58323721425af3752cefcbecbc5764a65fd6e54a413cf14fa37e8d752b7623e74fb46d0aa8674b2bf9523044905378

data/.github/workflows/{emit-release-event.yaml → cd.yml}

@@ -5,8 +5,8 @@ on:
     types: [published]
 
 jobs:
-  dispatchSchema:
-    name: "Dispatch Schema to Clients"
+  dispatch_schema:
+    name: Dispatch Schema to Clients
     runs-on: ubuntu-latest
 
     strategy:
@@ -15,7 +15,7 @@ jobs:
           - ladybug-tools/lbt-grasshopper
 
     steps:
-    - name: "send repo dispatch to lbt-grasshopper"
+    - name: Send repo dispatch to lbt-grasshopper
       env:
         RELEASE_TAG: ${{ github.event.release.tag_name }}
         DISPATCH_URL: https://api.github.com/repos/${{ matrix.client_repo }}/dispatches

data/.github/workflows/ci.yaml

@@ -0,0 +1,56 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+
+  test:
+    name: Unit tests
+    runs-on: ubuntu-18.04
+
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v2
+    - name: Run Tests
+      run: |
+        echo $(pwd)
+        echo $(ls)
+        docker pull nrel/openstudio:3.1.0
+        docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.1.0
+        docker exec -t test pwd
+        docker exec -t test ls
+        docker exec -t test bundle update
+        docker exec -t test bundle exec rake
+        docker kill test
+
+  deploy:
+    name: Deploy to GitHub and Rubygems.org
+    runs-on: ubuntu-latest
+    needs: test
+    if: github.ref == 'refs/heads/master' && github.repository_owner == 'ladybug-tools'
+    steps:
+      - uses: actions/checkout@v2
+      - name: set up node  # we need node for for semantic release
+        uses: actions/setup-node@v2.1.2
+        with:
+          node-version: 14.2.0
+      - name: install semantic-release
+        run:
+          npm install @semantic-release/exec
+      - name: run semantic release
+        uses: cycjimmy/semantic-release-action@v2
+        id: semantic   # Need an `id` for output variables
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Update gemspec
+        if: steps.semantic.outputs.new_release_published == 'true'
+        env:
+          RELEASE_TAG: ${{ steps.semantic.outputs.new_release_version }}
+        run: |
+          export CLEAN_TAG=$(echo $RELEASE_TAG | sed 's/v//g')
+          sed -i 's/"0.0.0"/'"'$CLEAN_TAG'"'/g' honeybee-openstudio.gemspec
+      - name: Release Gem
+        if: steps.semantic.outputs.new_release_published == 'true'
+        uses: dawidd6/action-publish-gem@v1
+        with:
+          api_key: ${{secrets.RUBYGEMS_API_KEY}}

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/ladybug-tools/honeybee-openstudio-gem.svg?branch=master)](https://travis-ci.org/ladybug-tools/honeybee-openstudio-gem)
+[![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)

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

data/lib/to_openstudio/construction/air.rb

@@ -46,12 +46,7 @@ module Honeybee
       os_construction = OpenStudio::Model::ConstructionAirBoundary.new(openstudio_model)
       os_construction.setName(@hash[:identifier])
       os_construction.setSolarAndDaylightingMethod('GroupedZones')
-      # REMOVE: Remove the use of IRTSurface once the AFN works with GroupedZone air walls
-      if !$use_simple_vent  # we're using the AFN!
-        os_construction.setRadiantExchangeMethod('IRTSurface')
-      else
-        os_construction.setRadiantExchangeMethod('GroupedZones')
-      end
+      os_construction.setRadiantExchangeMethod('GroupedZones')
       os_construction.setAirExchangeMethod('None')
 
       os_construction

data/lib/to_openstudio/hvac/template.rb

@@ -33,13 +33,15 @@ require 'honeybee/hvac/template'
 
 require 'to_openstudio/model_object'
 
-require 'openstudio-standards'
-require_relative 'Model.hvac'
-
 module Honeybee
   class TemplateHVAC
 
     def to_openstudio(openstudio_model, room_ids)
+
+      # only load openstudio-standards when needed
+      require 'openstudio-standards'
+      require_relative 'Model.hvac'
+
       # get the defaults for the specific system type
       hvac_defaults = defaults(@hash[:type])
 
@@ -82,14 +84,6 @@ module Honeybee
         end
       end
 
-      # TODO: consider adding the ability to decentralize the plant by changing loop names
-      #os_hvac.each do |hvac_loop|
-      #  loop_name = hvac_loop.name
-      #  unless loop_name.empty?
-      #    hvac_loop.setName(@hash[:identifier] + ' - ' + loop_name.get)
-      #  end
-      #end
-
       # assign the economizer type if there's an air loop and the economizer is specified
       if @hash[:economizer_type] && @hash[:economizer_type] != 'Inferred' && os_air_loop
         oasys = os_air_loop.airLoopHVACOutdoorAirSystem
@@ -126,9 +120,17 @@ module Honeybee
         erv.setLatentEffectivenessat75HeatingAirFlow(@hash[:latent_heat_recovery])
       end
 
+      # set all plants to non-coincident sizing to avoid simualtion control on design days
+      openstudio_model.getPlantLoops.each do |loop|
+        sizing = loop.sizingPlant
+        sizing.setSizingOption('NonCoincident')
+      end
+
       os_hvac
     end
 
+  private
+
     def get_existing_erv(os_air_loop)
       # get an existing heat ecovery unit from an air loop; will be nil if there is none
       os_air_loop.oaComponents.each do |supply_component|

data/lib/to_openstudio/schedule/ruleset.rb

@@ -85,10 +85,7 @@ module Honeybee
         holiday_schedule = openstudio_model.getScheduleDayByName(@hash[:holiday_schedule])
         unless holiday_schedule.empty?
           holiday_schedule_object = holiday_schedule.get
-          begin
-            os_sch_ruleset.setHolidaySchedule(holiday_schedule_object)
-          rescue NoMethodError  # REMOVE: Once the upgrade to OpenStudio 3.0 is official
-          end
+          os_sch_ruleset.setHolidaySchedule(holiday_schedule_object)
         end
       end
 

data/lib/to_openstudio/simulation/parameter_model.rb

@@ -98,54 +98,28 @@ module Honeybee
 
       # set defaults for the Model's ShadowCalculation object
       os_shadow_calc = @openstudio_model.getShadowCalculation
-      begin
-        os_shadow_calc.setShadingCalculationMethod(
-          shdw_defaults[:calculation_method][:default])
-      rescue NoMethodError  # REMOVE: Once the upgrade to OpenStudio 3.0 is official
-        os_shadow_calc.setCalculationMethod(
-          shdw_defaults[:calculation_method][:default])
-      end
-      begin
-        os_shadow_calc.setShadingCalculationUpdateFrequencyMethod(
-          shdw_defaults[:calculation_update_method][:default])
-      rescue  # REMOVE: Once the upgrade to OpenStudio 3.0 is official
-      end
-      begin
-        os_shadow_calc.setShadingCalculationUpdateFrequency(
-          shdw_defaults[:calculation_frequency][:default])
-      rescue NoMethodError  # REMOVE: Once the upgrade to OpenStudio 3.0 is official
-        os_shadow_calc.setCalculationFrequency(
-          shdw_defaults[:calculation_frequency][:default])
-      end
+      os_shadow_calc.setShadingCalculationMethod(
+        shdw_defaults[:calculation_method][:default])
+      os_shadow_calc.setShadingCalculationUpdateFrequencyMethod(
+        shdw_defaults[:calculation_update_method][:default])
+      os_shadow_calc.setShadingCalculationUpdateFrequency(
+        shdw_defaults[:calculation_frequency][:default])
       os_shadow_calc.setMaximumFiguresInShadowOverlapCalculations(
         shdw_defaults[:maximum_figures][:default])
 
       # override any ShadowCalculation defaults with lodaded JSON
       if @hash[:shadow_calculation]
         if @hash[:shadow_calculation][:calculation_method]
-          begin
-            os_shadow_calc.setShadingCalculationMethod(
-              @hash[:shadow_calculation][:calculation_method])
-          rescue NoMethodError  # REMOVE: Once the upgrade to OpenStudio 3.0 is official
-            os_shadow_calc.setCalculationMethod(
-              @hash[:shadow_calculation][:calculation_method])
-          end
+          os_shadow_calc.setShadingCalculationMethod(
+            @hash[:shadow_calculation][:calculation_method])
         end
         if @hash[:shadow_calculation][:calculation_update_method]
-          begin
-            os_shadow_calc.setShadingCalculationUpdateFrequencyMethod(
-              @hash[:shadow_calculation][:calculation_update_method])
-          rescue  # REMOVE: Once the upgrade to OpenStudio 3.0 is official
-          end
+          os_shadow_calc.setShadingCalculationUpdateFrequencyMethod(
+            @hash[:shadow_calculation][:calculation_update_method])
         end
         if @hash[:shadow_calculation][:calculation_frequency]
-          begin
-            os_shadow_calc.setShadingCalculationUpdateFrequency(
-              @hash[:shadow_calculation][:calculation_frequency])
-          rescue NoMethodError  # REMOVE: Once the upgrade to OpenStudio 3.0 is official
-            os_shadow_calc.setCalculationFrequency(
-              @hash[:shadow_calculation][:calculation_frequency])
-          end
+          os_shadow_calc.setShadingCalculationUpdateFrequency(
+            @hash[:shadow_calculation][:calculation_frequency])
         end
         if @hash[:shadow_calculation][:maximum_figures]
           os_shadow_calc.setMaximumFiguresInShadowOverlapCalculations(
@@ -192,15 +166,9 @@ module Honeybee
           end
         end
         if @hash[:output][:summary_reports]
-          begin
-            os_report = @openstudio_model.getOutputTableSummaryReports
-          rescue  # REMOVE: Once the upgrade to OpenStudio 3.0 is official
-          end
+          os_report = @openstudio_model.getOutputTableSummaryReports
           @hash[:output][:summary_reports].each do |report|
-            begin
-              os_report.addSummaryReport(report)
-            rescue NoMethodError  # REMOVE: Once the upgrade to OpenStudio 3.0 is official
-            end
+            os_report.addSummaryReport(report)
           end
         end
       end
@@ -242,13 +210,10 @@ module Honeybee
         # Set the holidays
         if @hash[:run_period][:holidays]
           @hash[:run_period][:holidays].each do |hol|
-            begin
-              os_hol = OpenStudio::Model::RunPeriodControlSpecialDays.new(
-                OpenStudio::MonthOfYear.new(hol[0]), hol[1], @openstudio_model)
-              os_hol.setDuration(1)
-              os_hol.setSpecialDayType('Holiday')
-            rescue NoMethodError  # REMOVE: Once the upgrade to OpenStudio 3.0 is official
-            end
+            os_hol = OpenStudio::Model::RunPeriodControlSpecialDays.new(
+              OpenStudio::MonthOfYear.new(hol[0]), hol[1], @openstudio_model)
+            os_hol.setDuration(1)
+            os_hol.setSpecialDayType('Holiday')
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeybee-openstudio
 version: !ruby/object:Gem::Version
-  version: 2.7.5
+  version: 2.8.3
 platform: ruby
 authors:
 - Tanushree Charan
@@ -11,8 +11,92 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-25 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: public_suffix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.1
+- !ruby/object:Gem::Dependency
+  name: json-schema
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.54.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.54.0
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
@@ -64,12 +148,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
-- ".github/workflows/emit-release-event.yaml"
-- ".github/workflows/pull_request.yaml"
+- ".github/workflows/cd.yml"
+- ".github/workflows/ci.yaml"
 - ".gitignore"
 - ".releaserc.json"
-- ".travis.yml"
 - Gemfile
 - LICENSE.md
 - README.md
@@ -204,16 +286,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Gem for translating between Honeybee JSON and OpenStudio Model.

data/.coveralls.yml

@@ -1 +0,0 @@
-service_name: travis-ci

data/.github/workflows/pull_request.yaml

@@ -1,25 +0,0 @@
-name: Pull Request CI
-
-on:
-  pull_request:
-    branches:
-      - master
-      - develop
-
-jobs:
-  test_3x:
-    runs-on: ubuntu-18.04
-    steps:
-    - name: Check out repository
-      uses: actions/checkout@v2
-    - name: Run Tests
-      run: |
-        echo $(pwd)
-        echo $(ls)
-        docker pull nrel/openstudio:3.1.0
-        docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.1.0
-        docker exec -t test pwd
-        docker exec -t test ls
-        docker exec -t test bundle update
-        docker exec -t test bundle exec rake
-        docker kill test

data/.travis.yml

@@ -1,44 +0,0 @@
-dist: bionic
-language: ruby
-
-rvm:
-  - 2.5
-
-before_install:
-# install openstudio
-- wget https://github.com/NREL/OpenStudio/releases/download/v3.0.0/OpenStudio-3.0.0+1c9617fa4e-Linux.deb
-- sudo dpkg -i ./OpenStudio-3.0.0+1c9617fa4e-Linux.deb
-# install the openstudio extension gem
-- export RUBYLIB=/usr/local/openstudio-3.0.0/Ruby
-- gem install openstudio-extension -v 0.2.3
-
-install:
-  - bundle install
-
-jobs:
-  include:
-  - stage: test
-    script:
-    - rake
-  - stage: deploy
-    if: branch = master AND (NOT type IN (pull_request))
-    before_install:
-    - nvm install lts/* --latest-npm
-    install:
-    - npm install @semantic-release/exec
-    script:
-    - git config --global user.email "releases@ladybug.tools"
-    - git config --global user.name "ladybugbot"
-    - npx semantic-release
-  - stage: deploy
-    if: tag IS present
-    script:
-      - export CLEAN_TAG=$(echo $TRAVIS_TAG | sed 's/v//g')
-      - sed -i 's/"0.0.0"/'"'$CLEAN_TAG'"'/g' honeybee-openstudio.gemspec
-    deploy:
-      on:
-        tags: true
-      provider: rubygems
-      skip_cleanup: true
-      api_key: $API_KEY
-      gem: honeybee-openstudio