Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Roofing material restructure #426

Merged
merged 9 commits into from
Apr 1, 2020
Merged

Roofing material restructure #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a873654
Separate roof material tsv files for ua and fr.
joseph-robertson Mar 17, 2020
d47f1d4
Remove unneeded fr hack in build existing model measure.
joseph-robertson Mar 17, 2020
a9fa9aa
Add none option for ua, separate roof mat in options lookup.
joseph-robertson Mar 17, 2020
f2d5f99
Update xmls, osws and apply rubocop.
joseph-robertson Mar 17, 2020
9bbb091
Fix radiant barrier dependencies.
joseph-robertson Mar 17, 2020
acc4a4e
Update the changelog.
joseph-robertson Mar 17, 2020
6c825f3
Merge branch 'master' into roof-mat-restructure
afontani Mar 18, 2020
55a7c9e
Line ending issues with window areas tsv.
joseph-robertson Mar 30, 2020
8d6a9d8
Merge branch 'master' into roof-mat-restructure
joseph-robertson Mar 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Features
- Increase the diversity of the infiltration simulated. Now using the Residential Diagnostics Database for the Infiltration housing characteristic ([#427](https://github.com/NREL/OpenStudio-BuildStock/pull/427)).

Fixes
- Restructure unfinished attic and finished roof -related tsv files (i.e., insulation, roof material, and radiant barrier) and options ([#426](https://github.com/NREL/OpenStudio-BuildStock/pull/426))
- Exclude net site energy consumption from annual and timeseries simulation output ("total" now reflects net of pv); change `include_enduse_subcategories` argument default to "true"; report either total interior equipment OR each of its components ([#405](https://github.com/NREL/OpenStudio-BuildStock/pull/405))
- Refactor the tsv maker classes to accommodate more data sources ([#392](https://github.com/NREL/OpenStudio-BuildStock/pull/392))
- Allow a building to be simulated with no water heater; map the "Other Fuel" option from the Water Heater tsv to no water heater ([#375](https://github.com/NREL/OpenStudio-BuildStock/pull/375))
Expand Down
2 changes: 0 additions & 2 deletions measures/BuildExistingModel/measure.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,9 @@ def run(model, runner, user_arguments)
if ["Single-Family Detached", "Mobile Home"].include? bldg_data["Geometry Building Type RECS"]
measures.delete("ResidentialGeometryCreateSingleFamilyAttached")
measures.delete("ResidentialGeometryCreateMultifamily")
measures.delete("ResidentialConstructionsFinishedRoof")
elsif bldg_data["Geometry Building Type RECS"] == "Single-Family Attached"
measures.delete("ResidentialGeometryCreateSingleFamilyDetached")
measures.delete("ResidentialGeometryCreateMultifamily")
measures.delete("ResidentialConstructionsFinishedRoof")
elsif ["Multi-Family with 2 - 4 Units", "Multi-Family with 5+ Units"].include? bldg_data["Geometry Building Type RECS"]
measures.delete("ResidentialGeometryCreateSingleFamilyDetached")
measures.delete("ResidentialGeometryCreateSingleFamilyAttached")
Expand Down
6 changes: 3 additions & 3 deletions measures/BuildExistingModel/measure.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<schema_version>3.0</schema_version>
<name>build_existing_model</name>
<uid>dedf59bb-3b88-4f16-8755-2c1ff5519cbf</uid>
<version_id>ddb1178a-cb38-492a-84d7-534fd5d25142</version_id>
<version_modified>20200118T171809Z</version_modified>
<version_id>621374d1-005d-45b3-a8b0-8f2a17f94a7a</version_id>
<version_modified>20200317T180552Z</version_modified>
<xml_checksum>2C38F48B</xml_checksum>
<class_name>BuildExistingModel</class_name>
<display_name>Build Existing Model</display_name>
Expand Down Expand Up @@ -81,7 +81,7 @@
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>7905BAFA</checksum>
<checksum>9E3349AE</checksum>
</file>
</files>
</measure>
542 changes: 451 additions & 91 deletions project_multifamily_beta/housing_characteristics/Insulation Unfinished Attic.tsv
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions project_multifamily_beta/housing_characteristics/Radiant Barrier Unfinished Attic.tsv
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions project_multifamily_beta/housing_characteristics/Radiant Barrier.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Dependency=Geometry Building Type RECS Option=None Option=Yes Option=No
Mobile Home 0.000000 0.000000 1.000000
Single-Family Detached 0.000000 0.000000 1.000000
Single-Family Attached 0.000000 0.000000 1.000000
Multi-Family with 2 - 4 Units 1.000000 0.000000 0.000000
Multi-Family with 5+ Units 1.000000 0.000000 0.000000
6 changes: 6 additions & 0 deletions project_multifamily_beta/housing_characteristics/Roof Material Finished Roof.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Dependency=Geometry Building Type RECS Option=None "Option=Asphalt Shingles, Medium"
Mobile Home 1.000000 0.000000
Single-Family Detached 1.000000 0.000000
Single-Family Attached 1.000000 0.000000
Multi-Family with 2 - 4 Units 0.000000 1.000000
Multi-Family with 5+ Units 0.000000 1.000000
6 changes: 6 additions & 0 deletions project_multifamily_beta/housing_characteristics/Roof Material Unfinished Attic.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Dependency=Geometry Building Type RECS Option=None "Option=Asphalt Shingles, Medium"
Mobile Home 0.000000 1.000000
Single-Family Detached 0.000000 1.000000
Single-Family Attached 0.000000 1.000000
Multi-Family with 2 - 4 Units 1.000000 0.000000
Multi-Family with 5+ Units 1.000000 0.000000
2 changes: 0 additions & 2 deletions project_multifamily_beta/housing_characteristics/Roof Material.tsv
View file
Open in desktop

This file was deleted.

8 changes: 6 additions & 2 deletions project_testing/housing_characteristics/Insulation Finished Roof.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
Option=Uninsulated Option=R-7 Option=R-13 Option=R-19 Option=R-30 Option=R-38 Option=R-49 Option=None
0.125000 0.125000 0.125000 0.125000 0.125000 0.125000 0.125000 0.125000
Dependency=Geometry Building Type RECS Option=None Option=Uninsulated Option=R-7 Option=R-13 Option=R-19 Option=R-30 Option=R-38 Option=R-49
Mobile Home 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
Single-Family Detached 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
Single-Family Attached 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
Multi-Family with 2 - 4 Units 0.000000 0.142857 0.142857 0.142857 0.142857 0.142857 0.142857 0.142857
Multi-Family with 5+ Units 0.000000 0.142857 0.142857 0.142857 0.142857 0.142857 0.142857 0.142857
8 changes: 6 additions & 2 deletions project_testing/housing_characteristics/Insulation Unfinished Attic.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
Option=Uninsulated, Vented Option=Ceiling R-7, Vented Option=Ceiling R-13, Vented Option=Ceiling R-19, Vented Option=Ceiling R-30, Vented Option=Ceiling R-38, Vented Option=Ceiling R-49, Vented Option=Roof R-19, Unvented Option=Roof R-49, Unvented
0.111111 0.111111 0.111111 0.111111 0.111111 0.111111 0.111111 0.111111 0.111111
Dependency=Geometry Building Type RECS Option=None "Option=Uninsulated, Vented" "Option=Ceiling R-7, Vented" "Option=Ceiling R-13, Vented" "Option=Ceiling R-19, Vented" "Option=Ceiling R-30, Vented" "Option=Ceiling R-38, Vented" "Option=Ceiling R-49, Vented" "Option=Roof R-19, Unvented" "Option=Roof R-49, Unvented"
Mobile Home 0.000000 0.111111 0.111111 0.111111 0.111111 0.111111 0.111111 0.111111 0.111111 0.111111
Single-Family Detached 0.000000 0.111111 0.111111 0.111111 0.111111 0.111111 0.111111 0.111111 0.111111 0.111111
Single-Family Attached 0.000000 0.111111 0.111111 0.111111 0.111111 0.111111 0.111111 0.111111 0.111111 0.111111
Multi-Family with 2 - 4 Units 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
Multi-Family with 5+ Units 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
2 changes: 0 additions & 2 deletions project_testing/housing_characteristics/Radiant Barrier Unfinished Attic.tsv
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions project_testing/housing_characteristics/Radiant Barrier.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Dependency=Geometry Building Type RECS Option=None Option=Yes Option=No
Mobile Home 0.000000 0.500000 0.500000
Single-Family Detached 0.000000 0.500000 0.500000
Single-Family Attached 0.000000 0.500000 0.500000
Multi-Family with 2 - 4 Units 1.000000 0.000000 0.000000
Multi-Family with 5+ Units 1.000000 0.000000 0.000000
6 changes: 6 additions & 0 deletions project_testing/housing_characteristics/Roof Material Finished Roof.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Dependency=Geometry Building Type RECS Option=None "Option=Asphalt Shingles, Dark" "Option=Asphalt Shingles, Medium" "Option=Asphalt Shingles, Light" "Option=Asphalt Shingles, White or cool colors" "Option=Tile, Dark" "Option=Tile, Medium" "Option=Tile, Light" "Option=Tile, White" "Option=Metal, Dark" "Option=Metal, Medium" "Option=Metal, Light" "Option=Metal, White" Option=Galvanized Steel
Mobile Home 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
Single-Family Detached 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
Single-Family Attached 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
Multi-Family with 2 - 4 Units 0.000000 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923
Multi-Family with 5+ Units 0.000000 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923
6 changes: 6 additions & 0 deletions project_testing/housing_characteristics/Roof Material Unfinished Attic.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Dependency=Geometry Building Type RECS Option=None "Option=Asphalt Shingles, Dark" "Option=Asphalt Shingles, Medium" "Option=Asphalt Shingles, Light" "Option=Asphalt Shingles, White or cool colors" "Option=Tile, Dark" "Option=Tile, Medium" "Option=Tile, Light" "Option=Tile, White" "Option=Metal, Dark" "Option=Metal, Medium" "Option=Metal, Light" "Option=Metal, White" Option=Galvanized Steel
Mobile Home 0.000000 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923
Single-Family Detached 0.000000 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923
Single-Family Attached 0.000000 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923 0.076923
Multi-Family with 2 - 4 Units 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
Multi-Family with 5+ Units 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
2 changes: 0 additions & 2 deletions project_testing/housing_characteristics/Roof Material.tsv
View file
Open in desktop

This file was deleted.

Loading