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.

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

add Duct Location and Duct Leakage to Outside #1104

Merged
merged 84 commits into from
Aug 9, 2023
Merged
Changes from 1 commit
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
66694b0
add Duct Location and Duct Leakage to Outside
lixiliu Jul 18, 2023
1ab1ad2
update changelog and data dictionary
lixiliu Jul 18, 2023
0b50cac
remove HVAC Has Ducts=Void in project_testing/Duct Location
lixiliu Jul 18, 2023
811067d
update options_lookup
lixiliu Jul 18, 2023
55688b1
remove quotation marks in tsv comment
lixiliu Jul 19, 2023
2e41a2b
add ducts_return_location to options_lookup
lixiliu Jul 19, 2023
413c5ff
add duct surface area calc - attempt 1
lixiliu Jul 19, 2023
8cf8d59
updated tsvs without Void
lixiliu Jul 19, 2023
d51cf3a
Revert "add duct surface area calc - attempt 1"
lixiliu Jul 24, 2023
49acd9e
duct surface area assignment - attempt 2
lixiliu Jul 24, 2023
3b38f83
Merge branch 'develop' into ll/duct_location
lixiliu Jul 24, 2023
a8fdd21
attempt 3
lixiliu Jul 24, 2023
9f22c9b
update logics to use HPXML constants
lixiliu Jul 25, 2023
21fc2df
ruby syntax error fix
lixiliu Jul 25, 2023
136a90e
fix options_lookup
lixiliu Jul 25, 2023
d88edab
fix to update surface areas in args
lixiliu Jul 25, 2023
f1321e3
attempt 4
lixiliu Jul 25, 2023
de344a7
assign 0 when load_served nil + run update_measures
lixiliu Jul 25, 2023
6a005ff
attempt 5
lixiliu Jul 26, 2023
c54d648
Update the FoundationType upgrade to support new duct refactor.
joseph-robertson Jul 26, 2023
79bbe09
Update the precomputed buildstock csv test file.
joseph-robertson Jul 26, 2023
d729711
Merge branch 'develop' into ll/duct_location
lixiliu Jul 26, 2023
e4e792c
add overrides for ducts-HVAC discrepancies
lixiliu Jul 26, 2023
0fc3e11
add overrides for duct leakage too + update_measures
lixiliu Jul 26, 2023
9c11485
Merge branch 'develop' into ll/duct_location
joseph-robertson Jul 28, 2023
8ef7aff
fix project_testing tsv + update test_run_analysis.rb
lixiliu Jul 29, 2023
cd7fe6e
Merge commit '638ffcce9de8642c1ab0a9dfb7e49b6736e6da20' into ll/duct_…
joseph-robertson Jul 31, 2023
638ffcc
Squashed 'resources/hpxml-measures/' changes from b6fc15547a72..8622c…
joseph-robertson Jul 31, 2023
5df40b3
Revert changes to resstock arguments measure.
joseph-robertson Jul 31, 2023
4ed1ebe
Revert change to expected run_analysis warning.
joseph-robertson Jul 31, 2023
4f9b95a
Update lookup for new area_fraction arguments.
joseph-robertson Jul 31, 2023
254fd90
Remove the expected ducts warning.
joseph-robertson Jul 31, 2023
d438e02
Bad speeling in lookup.
joseph-robertson Jul 31, 2023
6d6274c
Merge commit '10dfb788fd8eef7e7edcfff5bd6ec34fee19c416' into ll/duct_…
joseph-robertson Jul 31, 2023
10dfb78
Squashed 'resources/hpxml-measures/' changes from 8622c16013ae..efd77…
joseph-robertson Jul 31, 2023
bad50aa
Fix typo in inputs data dictionary.
joseph-robertson Aug 1, 2023
8610958
Build docs as the very last config step.
joseph-robertson Aug 1, 2023
2c27fa5
Updated source report.
joseph-robertson Aug 1, 2023
5bbbd00
Latest results.
Aug 1, 2023
43d06d4
Update config, source report, and inputs data dictionary.
joseph-robertson Aug 1, 2023
176928d
Merge branch 'll/duct_location' into ll/duct_location2
joseph-robertson Aug 1, 2023
4b1c4f2
Latest results.
Aug 1, 2023
794055f
Merge branch 'll/duct_location' into ll/duct_location2
joseph-robertson Aug 2, 2023
dbb2be2
fix Ducts + HVAC inconsistencies
lixiliu Aug 3, 2023
27fa7de
fix Ducts + HVAC inconsistencies
lixiliu Aug 3, 2023
0668fa3
fix name change error + all latest tsvs
lixiliu Aug 3, 2023
15a06bf
fix name change error + all latest tsvs
lixiliu Aug 3, 2023
a5adfcb
fix options_lookup error from cherrypick commit
lixiliu Aug 3, 2023
d4ba618
Latest results.
Aug 3, 2023
1e45822
Latest results.
Aug 3, 2023
bb7105c
Merge branch 'll/duct_location' into ll/duct_location2
joseph-robertson Aug 4, 2023
8025e3b
Try a 10k national baseline run with 1 month run period.
joseph-robertson Aug 7, 2023
cf0404b
Try the 10k samples with run analysis measures only.
joseph-robertson Aug 7, 2023
a2f8233
update tsvs to fix Shared and Heating Efficiencies
lixiliu Aug 7, 2023
7553a49
Merge branch 'develop' into ll/duct_location
lixiliu Aug 7, 2023
a39efac
Merge branch 'll/duct_location' into ll/duct_location2
joseph-robertson Aug 8, 2023
b42570f
Try measures only on 1k datapoints.
joseph-robertson Aug 8, 2023
0b81e6b
update HVAC Heating Eff downstream tsv + update buildstock.csv
lixiliu Aug 8, 2023
ebf21f3
Merge branch 'll/duct_location' into ll/duct_location2
joseph-robertson Aug 8, 2023
ee079cf
Update precomputed tests to show failures.
joseph-robertson Aug 8, 2023
0d4e279
Latest results.
Aug 8, 2023
5ba375c
Latest results.
Aug 8, 2023
8faa06c
add sample_weight to buildstock
lixiliu Aug 8, 2023
f5204f9
Merge branch 'll/duct_location' of github.com:NREL/resstock into ll/d…
lixiliu Aug 8, 2023
a2eef5a
Merge branch 'll/duct_location' into ll/duct_location2
lixiliu Aug 8, 2023
c622d0d
Updates for new test.
joseph-robertson Aug 8, 2023
3056cb5
Merge branch 'll/duct_location' into ll/duct_location2
joseph-robertson Aug 8, 2023
03f09d8
Merge branch 'll/duct_location2' of github.com:NREL/resstock into ll/…
joseph-robertson Aug 8, 2023
39d4bb0
Latest results.
Aug 8, 2023
d325b36
update changelog + tsv name change
lixiliu Aug 8, 2023
6c8b91c
update changelog to point to PR2 link
lixiliu Aug 8, 2023
0088aaa
Merge branch 'll/duct_location' into ll/duct_location2
joseph-robertson Aug 8, 2023
57008ba
Squashed 'resources/hpxml-measures/' changes from efd774aaca88..704f0…
joseph-robertson Aug 8, 2023
8dd2bc7
Merge commit '57008baba4b933c97a309148648d6f82125d2077' into ll/duct_…
joseph-robertson Aug 8, 2023
ddb8006
Revert temporary changes used for testing.
joseph-robertson Aug 8, 2023
13f8b43
correct testing_baseline n_samples
lixiliu Aug 9, 2023
8390438
Merge branch 'll/duct_location' into ll/duct_location2
lixiliu Aug 9, 2023
102e51a
Latest results.
Aug 9, 2023
138c610
Latest results.
Aug 9, 2023
286ced5
Merge branch 'll/duct_location' into ll/duct_location2
joseph-robertson Aug 9, 2023
d5bfd70
Merge pull request #1112 from NREL/ll/duct_location2
joseph-robertson Aug 9, 2023
247263f
Update the changelog.
joseph-robertson Aug 9, 2023
196a7aa
Update pull request template. [ci skip]
joseph-robertson Aug 9, 2023
345ef1c
Update the national project source report.
joseph-robertson Aug 9, 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
34 changes: 21 additions & 13 deletions measures/ResStockArguments/measure.rb
Original file line number Diff line number Diff line change
Expand Up @@ -730,37 +730,29 @@ def run(model, runner, user_arguments)
if (args[:ducts_supply_location] != Constants.Auto) && (args[:ducts_supply_surface_area] == Constants.Auto)
# set surface area based on OS-HPXML defaults
f_out = (args[:geometry_unit_num_floors_above_grade] <= 1) ? 1.0 : 0.75
cfa_served = args[:geometry_unit_cfa] * [
args[:heating_system_fraction_heat_load_served] if args[:heating_system_type]=='Furnace',
args[:cooling_system_fraction_cool_load_served] if args[:cooling_system_type]=='central air conditioner',
args[:heat_pump_fraction_heat_load_served] if args[:heat_pump_type]=='air-to-air',
args[:heat_pump_fraction_cool_load_served] if args[:heat_pump_type]=='air-to-air',
].max
cfa_served = args[:geometry_unit_cfa] * get_max_heat_cool_load_served(args)
primary_duct_area = 0.27 * cfa_served * f_out
secondary_duct_area = 0.27 * cfa_served * (1.0 - f_out)
if args[:ducts_supply_location] == 'Living Space'
shorowit marked this conversation as resolved.
Show resolved Hide resolved
ducts_supply_surface_area = primary_duct_area + secondary_duct_area
else
ducts_supply_surface_area = primary_duct_area
end
end
if (args[:ducts_return_location] != Constants.Auto) && (args[:ducts_return_surface_area] == Constants.Auto)
# set surface area based on OS-HPXML defaults
f_out = (args[:geometry_unit_num_floors_above_grade] <= 1) ? 1.0 : 0.75
cfa_served = args[:geometry_unit_cfa] * [
args[:heating_system_fraction_heat_load_served] if args[:heating_system_type]=='Furnace',
args[:cooling_system_fraction_cool_load_served] if args[:cooling_system_type]=='central air conditioner',
args[:heat_pump_fraction_heat_load_served] if args[:heat_pump_type]=='air-to-air',
args[:heat_pump_fraction_cool_load_served] if args[:heat_pump_type]=='air-to-air',
].max
cfa_served = args[:geometry_unit_cfa] * get_max_heat_cool_load_served(args)
b_r = (args[:ducts_number_of_return_registers] < 6) ? (0.05 * args[:ducts_number_of_return_registers]) : 0.25
primary_duct_area = b_r * cfa_served * f_out
secondary_duct_area = b_r * cfa_served * (1.0 - f_out)
if args[:ducts_return_location] == 'Living Space'
ducts_supply_surface_area = primary_duct_area + secondary_duct_area
else
ducts_supply_surface_area = primary_duct_area
end
end

args.each do |arg_name, arg_value|
begin
if arg_value.is_initialized
Expand All @@ -781,6 +773,22 @@ def run(model, runner, user_arguments)
return true
end

def get_max_heat_cool_load_served(args):
load_served = []
if args[:heating_system_type] == 'Furnace'
shorowit marked this conversation as resolved.
Show resolved Hide resolved
load_served << args[:heating_system_fraction_heat_load_served]
end
if args[:cooling_system_type]=='central air conditioner'
load_served << args[:cooling_system_fraction_cool_load_served]
end
if args[:heat_pump_type]=='air-to-air'
load_served << args[:heat_pump_fraction_heat_load_served]
end
if args[:heat_pump_type]=='air-to-air'
load_served << args[:heat_pump_fraction_cool_load_served]
end
return load_served.max

def modify_setpoint_schedule(schedule, offset_magnitude, offset_schedule)
offset_schedule.each_with_index do |direction, i|
schedule[i] += offset_magnitude * direction
Expand Down
Loading