Merge branch 'develop' into ll/duct_location

NREL · Aug 7, 2023 · 7553a49 · 7553a49
2 parents a2f8233 + 91b3bb3
commit 7553a49
Show file tree

Hide file tree

Showing 8 changed files with 70,583 additions and 70,582 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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))
 - Fix/clarify duct location assignment by defining Duct Location.tsv and make Duct Leakage to Outside.tsv (formerly Duct.tsv) dependent on Duct Location ([#1104](https://github.com/NREL/resstock/pull/1104))
 
 ## ResStock v3.1.0

diff --git a/measures/ResStockArguments/measure.rb b/measures/ResStockArguments/measure.rb
@@ -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

diff --git a/test/base_results/baseline/annual/results_output.csv b/test/base_results/baseline/annual/results_output.csv
diff --git a/test/base_results/baseline/timeseries/buildstockbatch.csv b/test/base_results/baseline/timeseries/buildstockbatch.csv
diff --git a/test/base_results/baseline/timeseries/results_output.csv b/test/base_results/baseline/timeseries/results_output.csv
diff --git a/test/base_results/upgrades/annual/results_output.csv b/test/base_results/upgrades/annual/results_output.csv
diff --git a/test/base_results/upgrades/timeseries/buildstockbatch.csv b/test/base_results/upgrades/timeseries/buildstockbatch.csv
diff --git a/test/base_results/upgrades/timeseries/results_output.csv b/test/base_results/upgrades/timeseries/results_output.csv