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

Update Avg Conditioned Floor Area #1284

Closed
wants to merge 8 commits into from
Closed

Update Avg Conditioned Floor Area #1284

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5081631
Update Avg Conditioned Floor area
rajeee Aug 12, 2024
7442385
Latest results.
Aug 13, 2024
d8db2c7
Update conditioned floor area
rajeee Sep 30, 2024
7d15376
Merge branch 'develop' into rajeee-floor-area-patch
rajeee Sep 30, 2024
625829c
Latest results.
Oct 1, 2024
e1da4b4
Add some notes about how the mapping values are created
afontani Oct 1, 2024
d430423
Directly call out where the bin value outside the bin range
afontani Oct 1, 2024
bf90e66
Update changelog
afontani Oct 1, 2024
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
74 changes: 37 additions & 37 deletions measures/ResStockArguments/measure.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,43 +404,43 @@ def run(model, runner, user_arguments)

# Conditioned floor area
if args[:geometry_unit_cfa] == Constants.Auto
# TODO: Disaggregate detached and mobile home
cfas = { ['0-499', HPXML::ResidentialTypeSFD] => 298, # AHS 2021, 1 detached and mobile home weighted average
['0-499', HPXML::ResidentialTypeSFA] => 273, # AHS 2021, 1 attached
['0-499', HPXML::ResidentialTypeApartment] => 322, # AHS 2021, multi-family weighted average
['0-499', HPXML::ResidentialTypeManufactured] => 298, # AHS 2021, 1 detached and mobile home weighted average
['500-749', HPXML::ResidentialTypeSFD] => 634, # AHS 2021, 1 detached and mobile home weighted average
['500-749', HPXML::ResidentialTypeSFA] => 625, # AHS 2021, 1 attached
['500-749', HPXML::ResidentialTypeApartment] => 623, # AHS 2021, multi-family weighted average
['500-749', HPXML::ResidentialTypeManufactured] => 634, # AHS 2021, 1 detached and mobile home weighted average
['750-999', HPXML::ResidentialTypeSFD] => 881, # AHS 2021, 1 detached and mobile home weighted average
['750-999', HPXML::ResidentialTypeSFA] => 872, # AHS 2021, 1 attached
['750-999', HPXML::ResidentialTypeApartment] => 854, # AHS 2021, multi-family weighted average
['750-999', HPXML::ResidentialTypeManufactured] => 881, # AHS 2021, 1 detached and mobile home weighted average
['1000-1499', HPXML::ResidentialTypeSFD] => 1228, # AHS 2021, 1 detached and mobile home weighted average
['1000-1499', HPXML::ResidentialTypeSFA] => 1207, # AHS 2021, 1 attached
['1000-1499', HPXML::ResidentialTypeApartment] => 1138, # AHS 2021, multi-family weighted average
['1000-1499', HPXML::ResidentialTypeManufactured] => 1228, # AHS 2021, 1 detached and mobile home weighted average
['1500-1999', HPXML::ResidentialTypeSFD] => 1698, # AHS 2021, 1 detached and mobile home weighted average
['1500-1999', HPXML::ResidentialTypeSFA] => 1678, # AHS 2021, 1 attached
['1500-1999', HPXML::ResidentialTypeApartment] => 1682, # AHS 2021, multi-family weighted average
['1500-1999', HPXML::ResidentialTypeManufactured] => 1698, # AHS 2021, 1 detached and mobile home weighted average
['2000-2499', HPXML::ResidentialTypeSFD] => 2179, # AHS 2021, 1 detached and mobile home weighted average
['2000-2499', HPXML::ResidentialTypeSFA] => 2152, # AHS 2021, 1 attached
['2000-2499', HPXML::ResidentialTypeApartment] => 2115, # AHS 2021, multi-family weighted average
['2000-2499', HPXML::ResidentialTypeManufactured] => 2179, # AHS 2021, 1 detached and mobile home weighted average
['2500-2999', HPXML::ResidentialTypeSFD] => 2678, # AHS 2021, 1 detached and mobile home weighted average
['2500-2999', HPXML::ResidentialTypeSFA] => 2663, # AHS 2021, 1 attached
['2500-2999', HPXML::ResidentialTypeApartment] => 2648, # AHS 2021, multi-family weighted average
['2500-2999', HPXML::ResidentialTypeManufactured] => 2678, # AHS 2021, 1 detached and mobile home weighted average
['3000-3999', HPXML::ResidentialTypeSFD] => 3310, # AHS 2021, 1 detached and mobile home weighted average
['3000-3999', HPXML::ResidentialTypeSFA] => 3228, # AHS 2021, 1 attached
['3000-3999', HPXML::ResidentialTypeApartment] => 3171, # AHS 2021, multi-family weighted average
['3000-3999', HPXML::ResidentialTypeManufactured] => 3310, # AHS 2021, 1 detached and mobile home weighted average
['4000+', HPXML::ResidentialTypeSFD] => 5587, # AHS 2021, 1 detached and mobile home weighted average
['4000+', HPXML::ResidentialTypeSFA] => 7414, # AHS 2019, 1 attached
['4000+', HPXML::ResidentialTypeApartment] => 6348, # AHS 2021, 4,000 or more all unit average
['4000+', HPXML::ResidentialTypeManufactured] => 5587 } # AHS 2021, 1 detached and mobile home weighted average
cfas = { ['0-499', HPXML::ResidentialTypeSFD] => 360, # From RECS2020
['0-499', HPXML::ResidentialTypeSFA] => 367, # From RECS2020
['0-499', HPXML::ResidentialTypeApartment] => 377, # From RECS2020
['0-499', HPXML::ResidentialTypeManufactured] => 386, # From RECS2020
['500-749', HPXML::ResidentialTypeSFD] => 575, # From RECS2020
['500-749', HPXML::ResidentialTypeSFA] => 550, # From RECS2020
['500-749', HPXML::ResidentialTypeApartment] => 589, # From RECS2020
['500-749', HPXML::ResidentialTypeManufactured] => 614, # From RECS2020
['750-999', HPXML::ResidentialTypeSFD] => 814, # From RECS2020
['750-999', HPXML::ResidentialTypeSFA] => 804, # From RECS2020
['750-999', HPXML::ResidentialTypeApartment] => 818, # From RECS2020
['750-999', HPXML::ResidentialTypeManufactured] => 856, # From RECS2020
['1000-1499', HPXML::ResidentialTypeSFD] => 1171, # From RECS2020
['1000-1499', HPXML::ResidentialTypeSFA] => 1161, # From RECS2020
['1000-1499', HPXML::ResidentialTypeApartment] => 1119, # From RECS2020
['1000-1499', HPXML::ResidentialTypeManufactured] => 1177, # From RECS2020
['1500-1999', HPXML::ResidentialTypeSFD] => 1596, # From RECS2020
['1500-1999', HPXML::ResidentialTypeSFA] => 1571, # From RECS2020
['1500-1999', HPXML::ResidentialTypeApartment] => 1603, # From RECS2020
['1500-1999', HPXML::ResidentialTypeManufactured] => 1615, # From RECS2020
['2000-2499', HPXML::ResidentialTypeSFD] => 2062, # From RECS2020
['2000-2499', HPXML::ResidentialTypeSFA] => 1983, # From RECS2020
afontani marked this conversation as resolved.
Show resolved Hide resolved
['2000-2499', HPXML::ResidentialTypeApartment] => 2135, # From RECS2020
['2000-2499', HPXML::ResidentialTypeManufactured] => 2082, # From RECS2020
['2500-2999', HPXML::ResidentialTypeSFD] => 2451, # From RECS2020
['2500-2999', HPXML::ResidentialTypeSFA] => 2299, # From RECS2020
['2500-2999', HPXML::ResidentialTypeApartment] => 2818, # From RECS2020
['2500-2999', HPXML::ResidentialTypeManufactured] => 2616, # From RECS2020
['3000-3999', HPXML::ResidentialTypeSFD] => 2998, # From RECS2020
afontani marked this conversation as resolved.
Show resolved Hide resolved
['3000-3999', HPXML::ResidentialTypeSFA] => 3077, # From RECS2020
['3000-3999', HPXML::ResidentialTypeApartment] => 3106, # From RECS2020
['3000-3999', HPXML::ResidentialTypeManufactured] => 3000, # From RECS2020
['4000+', HPXML::ResidentialTypeSFD] => 4277, # From RECS2020
['4000+', HPXML::ResidentialTypeSFA] => 3795, # From RECS2020
afontani marked this conversation as resolved.
Show resolved Hide resolved
['4000+', HPXML::ResidentialTypeApartment] => 5000, # From RECS2020
['4000+', HPXML::ResidentialTypeManufactured] => 5587, # From AHS 2021, 1 detached and mobile home weighted average
}
cfa = cfas[[args[:geometry_unit_cfa_bin], args[:geometry_unit_type]]]
if cfa.nil?
runner.registerError("ResStockArguments: Could not look up conditioned floor area for '#{args[:geometry_unit_cfa_bin]}' and '#{args[:geometry_unit_type]}'.")
Expand Down
700 changes: 350 additions & 350 deletions test/base_results/baseline/annual/results_output.csv
View file
Open in desktop

Large diffs are not rendered by default.

Loading