honeybee-openstudio 2.7.5 → 2.10.0

data/lib/to_openstudio/program_type.rb

@@ -75,6 +75,11 @@ module Honeybee
         os_gas_equipment.setSpaceType(os_space_type)
       end
 
+      # add hot water from to a global hash that will be used to assign them to rooms
+      if @hash[:service_hot_water]
+        $programtype_shw_hash[@hash[:identifier]] = @hash[:service_hot_water]
+      end
+
       # assign infiltration
       if @hash[:infiltration] && $use_simple_vent  # only use infiltration with simple ventilation
         infiltration = InfiltrationAbridged.new(@hash[:infiltration])

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
@@ -272,6 +237,10 @@ module Honeybee
       if @hash[:terrain_type]
         os_site.setTerrain(@hash[:terrain_type])
       end
+
+      # ensure water mains temperatures are written
+      os_water_mains = @openstudio_model.getSiteWaterMainsTemperature 
+      os_water_mains.setCalculationMethod('CorrelationFromWeatherFile')
     end
 
   end #SimulationParameter

data/lib/to_openstudio/ventcool/control.rb

@@ -64,7 +64,7 @@ module Honeybee
         @@program_manager.setCallingPoint('BeginTimestepBeforePredictor')
       end
       @@program_manager
-      end
+    end
 
     def replace_ems_special_characters(ems_variable_name)
       # remove special characters from an name to be used as an EMS variable

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeybee-openstudio
 version: !ruby/object:Gem::Version
-  version: 2.7.5
+  version: 2.10.0
 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-22 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
@@ -81,6 +163,7 @@ files:
 - doc_templates/copyright_ruby.txt
 - honeybee-openstudio.gemspec
 - lib/files/Honeybee.rb
+- lib/files/honeybee_adapter.rb
 - lib/files/honeybee_workflow.osw
 - lib/files/urbanopt_Gemfile
 - lib/from_openstudio.rb
@@ -117,6 +200,7 @@ files:
 - lib/honeybee/load/infiltration.rb
 - lib/honeybee/load/lighting.rb
 - lib/honeybee/load/people.rb
+- lib/honeybee/load/service_hot_water.rb
 - lib/honeybee/load/setpoint_humidistat.rb
 - lib/honeybee/load/setpoint_thermostat.rb
 - lib/honeybee/load/ventilation.rb
@@ -172,6 +256,7 @@ files:
 - lib/to_openstudio/load/infiltration.rb
 - lib/to_openstudio/load/lighting.rb
 - lib/to_openstudio/load/people.rb
+- lib/to_openstudio/load/service_hot_water.rb
 - lib/to_openstudio/load/setpoint_humidistat.rb
 - lib/to_openstudio/load/setpoint_thermostat.rb
 - lib/to_openstudio/load/ventilation.rb
@@ -204,16 +289,17 @@ 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
+rubyforge_project: 
+rubygems_version: 2.7.6
 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