Skip to content

Commit 7f45cab

Browse files
authored
Merge pull request #26 from rd2/v278
- TBD v3.3.0 - tests against Ruby v278 - tests against OpenStudio v3.7.0-rc1 - new OSut functionality - ASHRAE 90.1 2022 (A10) support
2 parents 59c5b86 + f6bfd87 commit 7f45cab

16 files changed

Lines changed: 11905 additions & 73638 deletions

.github/workflows/pull_request.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,35 @@ jobs:
8686
docker exec -t test bundle update
8787
docker exec -t test bundle exec rake
8888
docker kill test
89+
test_361x:
90+
runs-on: ubuntu-22.04
91+
steps:
92+
- name: Check out repository
93+
uses: actions/checkout@v3
94+
- name: Run Tests
95+
run: |
96+
echo $(pwd)
97+
echo $(ls -RF)
98+
docker pull nrel/openstudio:3.6.1
99+
docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.6.1
100+
docker exec -t test pwd
101+
docker exec -t test ls
102+
docker exec -t test bundle update
103+
docker exec -t test bundle exec rake
104+
docker kill test
105+
test_370x:
106+
runs-on: ubuntu-22.04
107+
steps:
108+
- name: Check out repository
109+
uses: actions/checkout@v2
110+
- name: Run Tests
111+
run: |
112+
echo $(pwd)
113+
echo $(ls)
114+
docker pull nrel/openstudio:dev-3.7.0-alpha
115+
docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:dev-3.7.0-alpha
116+
docker exec -t test pwd
117+
docker exec -t test ls
118+
docker exec -t test bundle update
119+
docker exec -t test bundle exec rake
120+
docker kill test

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Testing TBD
22

3-
_Thermal Bridging & Derating_ (or [TBD](https://github.com/rd2/tbd)) is 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.
3+
_Thermal Bridging & Derating_ (or [TBD](https://github.com/rd2/tbd)) is 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.
44

55
This repository houses the numerous automated TBD tests developed over time, in an effort to _lighten_ TBD as a Ruby gem. TBD and its dependencies are pulled-in automatically, before launching both TBD gem and OpenStudio measure RSpec tests.
66

@@ -41,14 +41,14 @@ bundle exec rake suites_run
4141

4242
Install [Docker](https://docs.docker.com/desktop/#download-and-install).
4343

44-
Pull the OpenStudio v3.4.0 Docker image:
44+
Pull the OpenStudio v3.6.1 Docker image:
4545
```
46-
docker pull nrel/openstudio:3.4.0
46+
docker pull nrel/openstudio:3.6.1
4747
```
4848

4949
In the root repository:
5050
```
51-
docker run --name test --rm -d -t -v ${PWD}:/work -w /work nrel/openstudio:3.4.0
51+
docker run --name test --rm -d -t -v ${PWD}:/work -w /work nrel/openstudio:3.6.1
5252
docker exec -t test bundle update
5353
docker exec -t test bundle exec rake
5454
docker kill test

json/tbd_warehouse17.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"schema": "https://github.com/rd2/tbd/blob/master/tbd.schema.json",
3+
"description": "testing roof/parapet switch (warehouse.osm)",
4+
"spaces": [{
5+
"id": "Zone3 Bulk Storage",
6+
"parapet": false
7+
}]
8+
}

json/tbd_warehouse18.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"schema": "https://github.com/rd2/tbd/blob/master/tbd.schema.json",
3+
"description": "testing roof/parapet switch (warehouse.osm)",
4+
"spaces": [{
5+
"id": "Zone3 Bulk Storage",
6+
"parapet": false
7+
}],
8+
"surfaces": [{
9+
"id": "Bulk Storage Rear Wall",
10+
"parapet": true
11+
}]
12+
}

lib/tbd_tests.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@
4141
module TBD_Tests
4242
extend TBD
4343

44-
TOL = TBD::TOL
45-
TOL2 = TBD::TOL2
46-
DBG = TBD::DEBUG # mainly to flag invalid arguments for devs (buggy code)
47-
INF = TBD::INFO # informs TBD user of measure success or failure
48-
WRN = TBD::WARN # e.g. WARN users of 'iffy' .osm inputs (yet not critical)
49-
ERR = TBD::ERR # e.g. flag invalid .osm inputs
50-
FTL = TBD::FATAL # e.g. invalid TBD JSON format/entries
51-
NS = "nameString" # OpenStudio IdfObject nameString method
44+
TOL = TBD::TOL # default distance tolerance (m)
45+
TOL2 = TBD::TOL2 # default area tolerance (m2)
46+
DBG = TBD::DEBUG # github.com/rd2/oslg
47+
INF = TBD::INFO # github.com/rd2/oslg
48+
WRN = TBD::WARN # github.com/rd2/oslg
49+
ERR = TBD::ERR # github.com/rd2/oslg
50+
FTL = TBD::FATAL # github.com/rd2/oslg
51+
NS = "nameString" # OpenStudio IdfObject nameString method
5252

5353
extend TBD
5454
end

lib/tbd_tests/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3030

3131
module TBD_Tests
32-
VERSION = "0.1.6".freeze
32+
VERSION = "0.1.7".freeze # TBD Tests release version
3333
end

spec/files/osms/in/5ZoneNoHVAC.osm

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -810,12 +810,6 @@ OS:Construction,
810810
{48484f33-0338-4a5d-bc40-ef6a5941f855}, ! Surface Rendering Name
811811
{dc7cc868-8241-43c9-8c61-bebd3fcd861d}; ! Layer 1
812812

813-
OS:Construction,
814-
{9682a96c-9b34-4d99-a3cd-69c9d07cf472}, ! Handle
815-
Air Wall, ! Name
816-
{ee3f3bac-2caa-43f8-8225-be8070b5a0cc}, ! Surface Rendering Name
817-
{c153e719-1dbd-4eeb-976d-73d92bfd184f}; ! Layer 1
818-
819813
OS:Construction,
820814
{bec28989-f033-4c43-8136-7188711452ed}, ! Handle
821815
CBECS 1980-2004 ExtRoof AtticFloor ClimateZone 1, ! Name
@@ -6323,10 +6317,6 @@ OS:Material:AirGap,
63236317
000 F05 Ceiling air space resistance, ! Name
63246318
0.17999999999999999; ! Thermal Resistance
63256319

6326-
OS:Material:AirWall,
6327-
{c153e719-1dbd-4eeb-976d-73d92bfd184f}, ! Handle
6328-
OS:Material:AirWall 1; ! Name
6329-
63306320
OS:Material:NoMass,
63316321
{6d48131d-e51a-45c6-9ef4-2f3111c0d744}, ! Handle
63326322
CP02 CARPET PAD, ! Name
@@ -7133,13 +7123,6 @@ OS:Rendering:Color,
71337123
227.46, ! Rendering Green Value
71347124
198.084; ! Rendering Blue Value
71357125

7136-
OS:Rendering:Color,
7137-
{ee3f3bac-2caa-43f8-8225-be8070b5a0cc}, ! Handle
7138-
Air Wall Color, ! Name
7139-
255.0, ! Rendering Red Value
7140-
0.0, ! Rendering Green Value
7141-
0.0; ! Rendering Blue Value
7142-
71437126
OS:Rendering:Color,
71447127
{aa7b5b62-5f83-4d8b-badd-9f1966f804a7}, ! Handle
71457128
CBECS 1980-2004 ExtRoof AtticFloor ClimateZone 1 Color, ! Name
@@ -12529,10 +12512,6 @@ OS:StandardsInformation:Construction,
1252912512
{fde10f26-f314-4f94-b481-f54ca946e691}, !- Handle
1253012513
{967dc359-58c0-4935-a00f-c59bc49a8407}; !- Construction Name
1253112514

12532-
OS:StandardsInformation:Construction,
12533-
{ada82d95-c048-4f26-836c-d8a91ebcfebf}, !- Handle
12534-
{9682a96c-9b34-4d99-a3cd-69c9d07cf472}; !- Construction Name
12535-
1253612515
OS:StandardsInformation:Material,
1253712516
{dc93c24a-831b-4d6f-90bd-d7d57b39bce4}, !- Handle
1253812517
{96e6891f-9edc-4b0d-82bc-853a9559ed17}; !- Material Name
@@ -12893,10 +12872,6 @@ OS:StandardsInformation:Construction,
1289312872
{478ec70e-1845-487a-9a15-8490dc4f6789}, !- Handle
1289412873
{c0c8a043-d913-4d04-a9b9-c35530422810}; !- Construction Name
1289512874

12896-
OS:StandardsInformation:Material,
12897-
{9130aee6-abde-4a4a-be3f-56d278bf69ae}, !- Handle
12898-
{c153e719-1dbd-4eeb-976d-73d92bfd184f}; !- Material Name
12899-
1290012875
OS:StandardsInformation:Construction,
1290112876
{4b854260-29d2-485a-afdd-5bb8bf0dd768}, !- Handle
1290212877
{c1ae9550-361c-4bb0-a84e-ac6b41c9f162}; !- Construction Name

0 commit comments

Comments
 (0)