Skip to content

Commit

Permalink
Merge pull request #1115 from NREL/3000_3999_apt_cfa_fix
Browse files Browse the repository at this point in the history
Typo for square feet area of multi-family
  • Loading branch information
joseph-robertson committed Aug 7, 2023
2 parents 91154f8 + 73b4efd commit 91b3bb3
Show file tree
Hide file tree
Showing 8 changed files with 35,469 additions and 35,468 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Fixes
- Set standard format for options_lookup ([#962](https://github.com/NREL/resstock/pull/962))
- Model a wood storage water heater when "Other Fuel" is sampled from Water Heater Efficiency.tsv (allowing downstream modeling of clothes washer/dryer). Similarly, model a wood wall/floor furnace when "Other" is sampled from HVAC Heating Efficiency.tsv ([#947](https://github.com/NREL/resstock/pull/947))
- Update ResStockArguments to support nonzero fraction of heat load served by the secondary heating system ([#1090](https://github.com/NREL/resstock/pull/1090))
- Fix square footage for a MF dwelling unit in the "3000-3999" CFA bin (from 33171 to 3171) ([#1115](https://github.com/NREL/resstock/pull/1115))

## ResStock v3.1.0
###### May 25, 2023 - [Diff](https://github.com/NREL/resstock/compare/v3.0.0...v3.1.0)
Expand Down
2 changes: 1 addition & 1 deletion measures/ResStockArguments/measure.rb
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ def run(model, runner, user_arguments)
['2500-2999', HPXML::ResidentialTypeApartment] => 2648, # AHS 2021, multi-family 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] => 33171, # AHS 2021, multi-family weighted average
['3000-3999', HPXML::ResidentialTypeApartment] => 3171, # AHS 2021, multi-family 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
Expand Down
12 changes: 6 additions & 6 deletions test/base_results/baseline/annual/results_output.csv

Large diffs are not rendered by default.

18,336 changes: 9,168 additions & 9,168 deletions test/base_results/baseline/timeseries/buildstockbatch.csv

Large diffs are not rendered by default.

17,520 changes: 8,760 additions & 8,760 deletions test/base_results/baseline/timeseries/results_output.csv

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions test/base_results/upgrades/annual/results_output.csv

Large diffs are not rendered by default.

17,520 changes: 8,760 additions & 8,760 deletions test/base_results/upgrades/timeseries/buildstockbatch.csv

Large diffs are not rendered by default.

17,520 changes: 8,760 additions & 8,760 deletions test/base_results/upgrades/timeseries/results_output.csv

Large diffs are not rendered by default.

0 comments on commit 91b3bb3

Please sign in to comment.