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

AK integration #1092

Closed
wants to merge 8 commits into from
Closed

AK integration #1092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
57def49
Ak downselect
rajeee Jun 15, 2023
fcddff8
Ak downselect
rajeee Apr 21, 2023
2a4560b
Fix TSV error
rajeee May 2, 2023
40afab7
Secondary heating TSVs
rajeee Jun 13, 2023
d04f93a
TSV changes
rajeee Jun 15, 2023
71362b2
remove secondary heating type and fuel
rajeee Jun 15, 2023
0d0b157
TSV updates
rajeee Jun 23, 2023
460e76a
Yaml update
rajeee Jun 26, 2023
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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@
**/.ipynb_checkpoints/*
**/data/*
!/resources/data/dictionary/outputs.csv
.history
8 changes: 2 additions & 6 deletions project_national/housing_characteristics/ASHRAE IECC Climate Zone 2004.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
Option=1A Option=2A Option=2B Option=3A Option=3B Option=3C Option=4A Option=4B Option=4C Option=5A Option=5B Option=6A Option=6B Option=7A Option=7AK Option=7B Option=8AK source_count source_weight sampling_probability
0.0179403 0.115935 0.0197434 0.13305 0.0929124 0.0234445 0.215302 0.0077307 0.0288003 0.225367 0.037893 0.0613171 0.0092306 0.00789633 0.00178684 0.00113165 0.000519458 1.10783e+07 1.34055e+08 1
# Created by: sources\spatial\tsv_maker.py
# Description: Climate zone according to ASHRAE 169 in 2004 and IECC in 2012 that the sample is located.
# Source: Spatial definitions are from the U.S. Census Bureau as of July 1, 2015.
# Source: Unit counts are from the American Community Survey 5-yr 2016.
# Source: Climate zone data are from ASHRAE 169 2006, IECC 2012, and M.C. Baechler 2015.
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.774765447 0 0.225234553 11078300 134055000 1
# Source: Created manually.
4 changes: 2 additions & 2 deletions project_national/housing_characteristics/HVAC Secondary Heating Efficiency.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Option=None sampling_probability
1 1
Option=None Option=30% Efficiency Option=60% Efficiency Option=100% Efficiency sampling_probability
0 0.3 0.3 0.4 1
# Created by: manually created
# Description: Efficiency of the secondary heating system (not used in project_national).
# Source: n/a
3 changes: 3 additions & 0 deletions project_national/housing_characteristics/HVAC Secondary Heating Fraction.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Option=None Option=10% Served Option=20% Served Option=30% Served Option=40% Served Option=50% Served sampling_probability
Copy link
Contributor

@joseph-robertson joseph-robertson Jun 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd suggest naming this file something like "HVAC Secondary Heating Partial Space Conditioning.tsv" so that it is consistent with the existing "HVAC Cooling Partial Space Conditioning.tsv" file name.

0 0.2 0.2 0.2 0.2 0.2 1
# Source: n/a
3 changes: 3 additions & 0 deletions project_national/housing_characteristics/HVAC Secondary Heating Fuel.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Option=None Option=Natural Gas Option=Electricity Option=Wood Option=Fuel Oil Option=Propane Option=Coal Option=Other sampling_probability
0 0.2 0.2 0.2 0.2 0.1 0.1 0 1
# Source: n/a
5 changes: 0 additions & 5 deletions project_national/housing_characteristics/HVAC Secondary Heating Type And Fuel.tsv
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions project_national/housing_characteristics/HVAC Secondary Heating Type.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Dependency=HVAC Secondary Heating Fuel Option=None Option=WallFurnace Option=FloorFurnace Option=Boiler Option=ElectricResistance Option=Stove Option=PortableHeater Option=Fireplace sampling_probability
None 1 0 0 0 0 0 0 0 0
Natural Gas 0 0.142857143 0.142857143 0.142857143 0.142857143 0.142857143 0.142857143 0.142857143 0.2
Electricity 0 0.142857143 0.142857143 0.142857143 0.142857143 0.142857143 0.142857143 0.142857143 0.2
Wood 0 0.142857143 0.142857143 0.142857143 0.142857143 0.142857143 0.142857143 0.142857143 0.2
Fuel Oil 0 0.142857143 0.142857143 0.142857143 0.142857143 0.142857143 0.142857143 0.142857143 0.2
Propane 0 0.142857143 0.142857143 0.142857143 0.142857143 0.142857143 0.142857143 0.142857143 0.2
Coal 0 0.142857143 0.142857143 0.142857143 0.142857143 0.142857143 0.142857143 0.142857143 0.2
Other 0 0.142857143 0.142857143 0.142857143 0.142857143 0.142857143 0.142857143 0.142857143 0.2
# Source: Manually created.
8 changes: 4 additions & 4 deletions project_national/national_baseline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ os_version: 3.6.1
os_sha: bb9481519e
buildstock_directory: ../ # Relative to this file or absolute
project_directory: project_national # Relative to buildstock_directory
output_directory: national_baseline
output_directory: out_national_baseline
weather_files_url: https://data.nrel.gov/system/files/156/BuildStock_TMY3_FIPS.zip
# weather_files_path: c:/OpenStudio/BuildStock_TMY3_FIPS.zip

sampler:
type: residential_quota
args:
n_datapoints: 250
n_datapoints: 100

workflow_generator:
type: residential_hpxml
args:
build_existing_model:
simulation_control_timestep: 60
simulation_control_timestep: 15
simulation_control_run_period_begin_month: 1
simulation_control_run_period_begin_day_of_month: 1
simulation_control_run_period_end_month: 12
Expand All @@ -32,7 +32,7 @@ workflow_generator:
- scenario_name: Bills

simulation_output_report:
timeseries_frequency: hourly
timeseries_frequency: timestep
include_timeseries_total_consumptions: true
include_timeseries_fuel_consumptions: true
include_timeseries_end_use_consumptions: true
Expand Down
25,541 changes: 12,779 additions & 12,762 deletions resources/options_lookup.tsv
View file
Open in desktop

Large diffs are not rendered by default.