tbd 3.2.3 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15442c735a4591e22e609b8b2f73733a583a5f6b304c3c479866d98afcf63251
-  data.tar.gz: c4d53db567cc419b2e0eb5b4b48f85f19e6c12745bab19ee257566c0c1b38bea
+  metadata.gz: 840a07d7ac8aab45d2c2e377c9aecfc7bfb6e02a2aa00736bd3d07da271d619e
+  data.tar.gz: 0f41e81875c54f81c00e8788b40569bde04e75233fd3a7d1f9b5e905aecf866c
 SHA512:
-  metadata.gz: e314e00796a8d0e6e44c6ccd23d0e9accaa45be119589da431d00f45354c622bbedd964b94053fd9823c33914713b07984e0f0df44f714d4311ac16f382c0407
-  data.tar.gz: 7344be85007deed2d9a22d83c0cb20d4860d4e048c1bf281e7f2c8024439696b75ba6d232c9f8985253003c1295d2e537fc29a9fb9322ea6d756bcd08ec0dcf9
+  metadata.gz: bf7839e2518c1fdff231b7f9ad9ac8a8b8fd6a2e3ca79e7441ca58c5c8d6dcf22d64ee6414fecd9160ec0cc1203f1a07ec862e7337ed27b1812f0ef59617d94b
+  data.tar.gz: f3fe90266432320e562a7119a4f11c9097cb958533c4b9e1c53089330b2fd79ca15884c798f9f49f3cb751ca8374f10801f77a0b070f8f039c242e4874338863

data/.github/workflows/pull_request.yml

@@ -86,3 +86,35 @@ jobs:
         docker exec -t test bundle update
         docker exec -t test bundle exec rake
         docker kill test
+  test_361x:
+    runs-on: ubuntu-22.04
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v2
+    - name: Run Tests
+      run: |
+        echo $(pwd)
+        echo $(ls)
+        docker pull nrel/openstudio:3.6.1
+        docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.6.1
+        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
+  test_370x:
+    runs-on: ubuntu-22.04
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v2
+    - name: Run Tests
+      run: |
+        echo $(pwd)
+        echo $(ls)
+        docker pull nrel/openstudio:dev-3.7.0-alpha
+        docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:dev-3.7.0-alpha
+        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/.yardopts

@@ -0,0 +1,14 @@
+--exclude lib/measures/tbd/measure.rb
+--exclude lib/measures/tbd/resources/tbd.rb
+--exclude lib/measures/tbd/resources/psi.rb
+--exclude lib/measures/tbd/resources/geo.rb
+--exclude lib/measures/tbd/resources/ua.rb
+--exclude lib/measures/tbd/resources/model.rb
+--exclude lib/measures/tbd/resources/geometry.rb
+--exclude lib/measures/tbd/resources/transformation.rb
+--exclude lib/measures/tbd/resources/version.rb
+--exclude lib/measures/tbd/resources/utils.rb
+--exclude lib/measures/tbd/resources/oslog.rb
+--exclude lib/measures/tbd/tests/tbd_tests.rb
+--exclude lib/measures/tbd/LICENSE.md
+--exclude lib/measures/tbd/README.md

data/README.md

@@ -1,20 +1,16 @@
 # Thermal Bridging & Derating (TBD)  
 
-An [OpenStudio Measure](https://nrel.github.io/OpenStudio-user-documentation/reference/measure_writing_guide/) that first autodetects _major_ thermal bridges (like balconies, parapets and corners) in an OpenStudio model (.osm), and then _derates_ outside-facing, opaque surface constructions (walls, roofs and exposed floors). It interacts with the [OpenStudio SDK](https://openstudio-sdk-documentation.s3.amazonaws.com/index.html) and relies on AutomaticMagic's [Topolys](https://github.com/automaticmagic/topolys) gem, as well as rd2's [OSut](https://rubygems.org/gems/osut/versions/0.2.7) gem.
+An [OpenStudio Measure](https://nrel.github.io/OpenStudio-user-documentation/reference/measure_writing_guide/) that first autodetects _major_ thermal bridges (like balconies, parapets and corners) in an OpenStudio model (.osm), and then _derates_ outside-facing, opaque surface constructions (walls, roofs and exposed floors). It interacts with the [OpenStudio SDK](https://openstudio-sdk-documentation.s3.amazonaws.com/index.html) and relies on AutomaticMagic's [Topolys](https://github.com/automaticmagic/topolys) gem, as well as rd2's [OSut](https://rubygems.org/gems/osut) gem.
 
 ## Guide & Downloads
 
-Building professionals and energy modellers are encouraged to first consult the online [Guide](https://rd2.github.io/tbd/) - it provides an overview of the underlying theory, references, suggested OpenStudio workflows, etc. Users can download the latest _TBD_ version directly from the Guide itself, or under [releases](https://github.com/rd2/tbd/releases), or via NREL's [BCL](https://bcl.nrel.gov) (search for "bridging" or "rd2").
-
-Questions can be posted on [UnmetHours](https://unmethours.com) - a very useful online resource for OpenStudio users.
-
-TBD can also be deployed as a Ruby gem, by adding:  
+Building professionals and energy modellers are encouraged to first consult the online [Guide](https://rd2.github.io/tbd/) - it provides an overview of the underlying theory, references, suggested OpenStudio workflows, etc. Users can download the latest _TBD_ version directly from the Guide itself, or under [releases](https://github.com/rd2/tbd/releases), or via NREL's [BCL](https://bcl.nrel.gov) (search for "bridging" or "rd2"). Questions can be posted on [UnmetHours](https://unmethours.com) - a very useful online resource for OpenStudio users. TBD is also available as a Ruby gem - add:  
 
 ```
 gem "tbd", git: "https://github.com/rd2/tbd", branch: "master"
 ```  
 
-... in a v2.1 [bundled](https://bundler.io) _Measure_ development environment "Gemfile" (or instead as a _gemspec_ dependency), and then run:  
+... in a v2.1 [bundled](https://bundler.io) _Measure_ development environment "Gemfile" (or preferably as a _gemspec_ dependency), and then run:  
 
 ```
 bundle install (or 'bundle update')
@@ -22,13 +18,13 @@ bundle install (or 'bundle update')
 
 ## New Features  
 
-Upcoming enhancements are in the works. Bugs or new feature requests for _TBD_ should be submitted [here](https://github.com/rd2/tbd/issues), while those more closely linked to _Topolys_ or _OSut_ should be submitted [here](https://github.com/automaticmagic/topolys/issues) or [here](https://github.com/rd2/osut/issues), respectively.
+Bugs or new feature requests for _TBD_ should be submitted [here](https://github.com/rd2/tbd/issues), while those more closely linked to _Topolys_ or _OSut_ should be submitted [here](https://github.com/automaticmagic/topolys/issues) or [here](https://github.com/rd2/osut/issues), respectively.
 
 ## Development
 
 The installation and testing instructions in this section are for developers interested in exploring/tweaking a cloned/forked version of the source code. In an effort to _lighten_ TBD as a Ruby gem, only the most basic tests are deployed in this repository. More detailed tests are housed in a dedicated TBD [testing](https://github.com/rd2/tbd_tests) repo.
 
-TBD is systematically tested against updated OpenStudio versions (since v3.0.0). The following instructions refer to OpenStudio v3.4.0 (requiring Ruby v2.7.2), strictly as an example. Adapt the instructions for more recent versions - see OpenStudio's [compatibility matrix](https://github.com/NREL/OpenStudio/wiki/OpenStudio-SDK-Version-Compatibility-Matrix).
+TBD is systematically tested against updated OpenStudio versions (since v3.0.0). The following instructions refer to OpenStudio v3.6.1 (requiring Ruby v2.7.2), strictly as an example. Adapt the instructions for more recent versions - see OpenStudio's [compatibility matrix](https://github.com/NREL/OpenStudio/wiki/OpenStudio-SDK-Version-Compatibility-Matrix).
 
 ### Windows Installation
 
@@ -37,17 +33,18 @@ Either install Ruby using the [RubyInstaller](https://rubyinstaller.org/download
 ruby -v
 ```
 
-Install bundler:
+Install bundler, if not already installed:
 ```
+bundler -v
 gem install bundler -v 2.1
 ```
 
-Install the OpenStudio SDK [3.4.0](https://github.com/NREL/OpenStudio/releases/tag/v3.4.0), or the OpenStudio Application [1.4.0](https://github.com/openstudiocoalition/OpenStudioApplication/releases/tag/v1.4.0).
+Install the OpenStudio SDK [3.6.1](https://github.com/NREL/OpenStudio/releases/tag/v3.6.1), or the OpenStudio Application [1.6.0](https://github.com/openstudiocoalition/OpenStudioApplication/releases/tag/v1.6.0).
 
 Create a new file ```C:\Ruby27-x64\lib\ruby\site_ruby\openstudio.rb``` (path may be different depending on the environment), and edit it so it _points_ to your new OpenStudio installation:
 
 ```
-require 'C:\openstudio-3.4.0\Ruby\openstudio.rb'
+require 'C:\openstudio-3.6.1\Ruby\openstudio.rb'
 ```
 
 Verify your OpenStudio and Ruby configuration:
@@ -66,9 +63,10 @@ brew install rbenv
 rbenv init
 rbenv install 2.7.2
 ```
-Install [bundler](https://bundler.io), great for managing Ruby gems and dependencies:
+Install [bundler](https://bundler.io) (if not already installed), great for managing Ruby gems and dependencies:
 
 ```
+bundler -v
 gem install bundler -v 2.1
 ```
 
@@ -78,43 +76,43 @@ In the Terminal, check the Ruby version:
 ruby -v
 ```
 
-... should still report the current Ruby version used by MacOS. To ensure the right version is used for developing OpenStudio Measures, instruct _rbenv_ to switch Ruby version _locally_ within a user’s chosen directory (e.g. "sandbox340"):
+... should still report the current Ruby version used by MacOS. To ensure the right version is used for developing OpenStudio Measures, instruct _rbenv_ to switch Ruby version _locally_ within a user’s chosen directory (e.g. "sandbox361"):
 
 ```
-mkdir ~/Documents/sandbox340
-cd ~/Documents/sandbox340
+mkdir ~/Documents/sandbox361
+cd ~/Documents/sandbox361
 rbenv local 2.7.2
 ruby -v
 ```
-… should report the desired _local_ Ruby version, to be used by default for anything under the "sandbox340" directory tree. To ensure both Ruby versions are operational and safe, run the following checkup twice - once from a user’s home (or ~/), then from within e.g., "sandbox340":
+… should report the desired _local_ Ruby version, to be used by default for anything under the "sandbox361" directory tree. To ensure both Ruby versions are operational and safe, run the following checkup twice - once from a user’s home (or ~/), then from within e.g. "sandbox361":
 
 ```
 cd ~/
 ruby -ropen-uri -e 'eval URI.open("https://git.io/vQhWq").read'
-cd ~/Documents/sandbox340
+cd ~/Documents/sandbox361
 ruby -ropen-uri -e 'eval URI.open("https://git.io/vQhWq").read'
 ```
 
 If successful, one should get a ```Hooray!``` from both Ruby versions confirming valid communication with [Rubygems](https://rubygems.org/).
 
-Install the OpenStudio SDK [3.4.0](https://github.com/NREL/OpenStudio/releases/tag/v3.4.0), or the OpenStudio Application [1.4.0](https://github.com/openstudiocoalition/OpenStudioApplication/releases/tag/v1.4.0).
+Install the OpenStudio SDK [3.6.1](https://github.com/NREL/OpenStudio/releases/tag/v3.6.1), or the OpenStudio Application [1.6.0](https://github.com/openstudiocoalition/OpenStudioApplication/releases/tag/v1.6.0).
 
 Create a new file ```~/.rbenv/versions/2.7.2/lib/ruby/site_ruby/openstudio.rb```  (path may be different depending on the environment), and edit it so it _points_ to your new OpenStudio installation:
 
 ```
-require '/Applications/OpenStudio-3.4.0/Ruby/openstudio.rb'
+require '/Applications/OpenStudio-3.6.1/Ruby/openstudio.rb'
 ```
 
 Verify your local OpenStudio and Ruby configuration:
 
 ```
-cd ~/Documents/sandbox340
+cd ~/Documents/sandbox361
 ruby -e "require 'openstudio'" -e "puts OpenStudio::Model::Model.new"
 ```
 
 ## Clone TBD
 
-Once done with either the Windows or MacOS setup, install the latest version of _git_ (e.g. through Homebrew), then ```git clone``` the TBD repo, e.g. under "sandbox340". Run the basic tests below to ensure the measure operates as expected.
+Once done with either the Windows or MacOS setup, install the latest version of _git_ (e.g. through Homebrew), then ```git clone``` the TBD repo, e.g. under "sandbox361". Run the basic tests below to ensure the measure operates as expected.
 
 ## Complete list of test commands
 
@@ -129,14 +127,14 @@ bundle exec rake
 
 Install [Docker](https://docs.docker.com/desktop/#download-and-install).
 
-Pull the OpenStudio v3.4.0 Docker image:
+Pull the OpenStudio v3.6.1 Docker image:
 ```
-docker pull nrel/openstudio:3.4.0
+docker pull nrel/openstudio:3.6.1
 ```
 
 In the root repository:
 ```
-docker run --name test --rm -d -t -v ${PWD}:/work -w /work nrel/openstudio:3.4.0
+docker run --name test --rm -d -t -v ${PWD}:/work -w /work nrel/openstudio:3.6.1
 docker exec -t test bundle update
 docker exec -t test bundle exec rake
 docker kill test

data/json/tbd_warehouse17.json

@@ -0,0 +1,8 @@
+{
+  "schema": "https://github.com/rd2/tbd/blob/master/tbd.schema.json",
+  "description": "testing roof/parapet switch (warehouse.osm)",
+  "spaces": [{
+    "id": "Zone3 Bulk Storage",
+    "parapet": false
+  }]
+}

data/json/tbd_warehouse18.json

@@ -0,0 +1,12 @@
+{
+  "schema": "https://github.com/rd2/tbd/blob/master/tbd.schema.json",
+  "description": "testing roof/parapet switch (warehouse.osm)",
+  "spaces": [{
+    "id": "Zone3 Bulk Storage",
+    "parapet": false
+  }],
+  "surfaces": [{
+    "id": "Bulk Storage Rear Wall",
+    "parapet": true
+  }]
+}

data/json/tbd_warehouse4.json

@@ -0,0 +1,17 @@
+{
+  "schema": "https://github.com/rd2/tbd/blob/master/tbd.schema.json",
+  "description": "test_warehouse.osm with negative PSI values",
+  "psis": [{
+    "id": "BETBG Detail 7.6.2",
+    "rimjoist": 0.0,
+    "parapet": 0.0,
+    "fenestration": 0.0,
+    "corner": -0.0471,
+    "balcony": 0.0,
+    "party": 0.0,
+    "grade": 0.0
+  }],
+  "building": {
+    "psi": "BETBG Detail 7.6.2"
+  }
+}

data/lib/measures/tbd/README.md

@@ -27,14 +27,6 @@ For EnergyPlus simulations, leave CHECKED. For iterative exploration with Apply
 **Required:** false,
 **Model Dependent:** false
 
-### Proximity tolerance (m)
-Proximity tolerance (e.g. 0.100 m) between subsurface edges, e.g. between near-adjacent window jambs.
-**Name:** sub_tol,
-**Type:** Double,
-**Units:** ,
-**Required:** false,
-**Model Dependent:** false
-
 ### Load 'tbd.json'
 Loads existing 'tbd.json' file (under '/files'), may override 'default thermal bridge' set.
 **Name:** load_tbd_json,
@@ -44,7 +36,7 @@ Loads existing 'tbd.json' file (under '/files'), may override 'default thermal b
 **Model Dependent:** false
 
 ### Default thermal bridge set
-e.g. 'poor', 'regular', 'efficient', 'code' (may be overridden by 'tbd.json' file).
+e.g. '90.1.22|steel.m|unmitigated' (may be overridden by 'tbd.json' file).
 **Name:** option,
 **Type:** Choice,
 **Units:** ,
@@ -52,13 +44,21 @@ e.g. 'poor', 'regular', 'efficient', 'code' (may be overridden by 'tbd.json' fil
 **Model Dependent:** false
 
 ### Write 'tbd.out.json'
-Write out 'tbd.out.json' file e.g., to customize for subsequent runs (edit, and place under '/files' as 'tbd.json').
+Write out 'tbd.out.json' file, e.g. to customize for subsequent runs (edit, and place under '/files' as 'tbd.json').
 **Name:** write_tbd_json,
 **Type:** Boolean,
 **Units:** ,
 **Required:** false,
 **Model Dependent:** false
 
+### Wall-roof edge as 'parapet'
+Leave CHECKED if wall-roof edge is considered a parapet or an overhang (see ASHRAE 90.1 2022 5.5.5.1 & A10).
+**Name:** parapet,
+**Type:** Boolean,
+**Units:** ,
+**Required:** false,
+**Model Dependent:** false
+
 ### Wall construction(s) to 'uprate'
 Target 1x (or 'ALL') wall construction(s) to 'uprate', to achieve wall Ut target below.
 **Name:** wall_option,
@@ -76,7 +76,7 @@ Target 1x (or 'ALL') roof construction(s) to 'uprate', to achieve roof Ut target
 **Model Dependent:** false
 
 ### Floor construction(s) to 'uprate'
-Target 1x (or 'ALL') floor construction(s) to 'uprate', to achieve floor Ut target below.
+Target 1x (or 'ALL') floor construction(s) to 'uprate', toachieve floor Ut target below.
 **Name:** floor_option,
 **Type:** Choice,
 **Units:** ,
@@ -139,6 +139,22 @@ Overwrites 'ground' boundary conditions as 'foundation' before generating Kiva i
 **Required:** false,
 **Model Dependent:** false
 
+### Purge existing KIVA inputs
+Purges KIVA entries from model before generating Kiva inputs.
+**Name:** reset_kiva,
+**Type:** Boolean,
+**Units:** ,
+**Required:** false,
+**Model Dependent:** false
+
+### Proximity tolerance (m)
+Proximity tolerance (e.g. 0.100 m) between subsurface edges, e.g. between near-adjacent window jambs.
+**Name:** sub_tol,
+**Type:** Double,
+**Units:** ,
+**Required:** false,
+**Model Dependent:** false
+