Skip to content

Commit

Permalink
Merge pull request #1118 from NREL/change_refrigerator_rated_annual_kwh
Browse files Browse the repository at this point in the history 
 change refrigerator rated annual kwh
  • Loading branch information
@lixiliu
lixiliu committed Aug 24, 2023
2 parents cc0133b + 978382c commit 45178e1
Show file tree
Hide file tree
Showing 8 changed files with 70,493 additions and 70,492 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ Fixes
- 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, making Duct Leakage and Insulation (formerly Duct) depend on Duct Location, and making HVAC Has Ducts depend on HVAC Has Shared Systems. Includes fixes on standalone and shared heating system assignment for Other Fuel. ([#1112](https://github.com/NREL/resstock/pull/1104), [#1112](https://github.com/NREL/resstock/pull/1112))
- Fix/clarify duct location assignment by defining Duct Location.tsv, making Duct Leakage and Insulation (formerly Duct) depend on Duct Location, and making HVAC Has Ducts depend on HVAC Has Shared Systems. Includes fixes on standalone and shared heating system assignment for Other Fuel. ([#1104](https://github.com/NREL/resstock/pull/1104), [#1112](https://github.com/NREL/resstock/pull/1112))
- Correct refrigerator rated annual kWh based on EF and an assumed volume of 20.9cft. ([#1118](https://github.com/NREL/resstock/pull/1118))

## ResStock v3.1.0
###### May 25, 2023 - [Diff](https://github.com/NREL/resstock/compare/v3.0.0...v3.1.0)
Expand Down
18 changes: 9 additions & 9 deletions resources/options_lookup.tsv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9920,13 +9920,13 @@ Misc Extra Refrigerator "EF 15.9, Fed Standard, bottom freezer-reference fridge"
Misc Extra Refrigerator "EF 19.8, bottom freezer" ResStockArguments extra_refrigerator_present=true extra_refrigerator_location=auto extra_refrigerator_rated_annual_kwh=458 extra_refrigerator_usage_multiplier=1.0
Misc Extra Refrigerator "EF 6.9, Average Installed" ResStockArguments extra_refrigerator_present=true extra_refrigerator_location=auto extra_refrigerator_rated_annual_kwh=1102 extra_refrigerator_usage_multiplier=1.0
Misc Extra Refrigerator "EF 6.9, National Average" ResStockArguments extra_refrigerator_present=true extra_refrigerator_location=auto extra_refrigerator_rated_annual_kwh=1102 extra_refrigerator_usage_multiplier=0.221
Misc Extra Refrigerator EF 10.2 ResStockArguments extra_refrigerator_present=true extra_refrigerator_location=auto extra_refrigerator_rated_annual_kwh=891 extra_refrigerator_usage_multiplier=1.0
Misc Extra Refrigerator EF 10.2 ResStockArguments extra_refrigerator_present=true extra_refrigerator_location=auto extra_refrigerator_rated_annual_kwh=748 extra_refrigerator_usage_multiplier=1.0
Misc Extra Refrigerator EF 10.5 ResStockArguments extra_refrigerator_present=true extra_refrigerator_location=auto extra_refrigerator_rated_annual_kwh=727 extra_refrigerator_usage_multiplier=1.0
Misc Extra Refrigerator EF 15.9 ResStockArguments extra_refrigerator_present=true extra_refrigerator_location=auto extra_refrigerator_rated_annual_kwh=480 extra_refrigerator_usage_multiplier=1.0
Misc Extra Refrigerator EF 17.6 ResStockArguments extra_refrigerator_present=true extra_refrigerator_location=auto extra_refrigerator_rated_annual_kwh=434 extra_refrigerator_usage_multiplier=1.0
Misc Extra Refrigerator EF 19.9 ResStockArguments extra_refrigerator_present=true extra_refrigerator_location=auto extra_refrigerator_rated_annual_kwh=400 extra_refrigerator_usage_multiplier=1.0
Misc Extra Refrigerator EF 21.9 ResStockArguments extra_refrigerator_present=true extra_refrigerator_location=auto extra_refrigerator_rated_annual_kwh=384 extra_refrigerator_usage_multiplier=1.0
Misc Extra Refrigerator EF 6.7 ResStockArguments extra_refrigerator_present=true extra_refrigerator_location=auto extra_refrigerator_rated_annual_kwh=1356 extra_refrigerator_usage_multiplier=1.0
Misc Extra Refrigerator EF 17.6 ResStockArguments extra_refrigerator_present=true extra_refrigerator_location=auto extra_refrigerator_rated_annual_kwh=433 extra_refrigerator_usage_multiplier=1.0
Misc Extra Refrigerator EF 19.9 ResStockArguments extra_refrigerator_present=true extra_refrigerator_location=auto extra_refrigerator_rated_annual_kwh=383 extra_refrigerator_usage_multiplier=1.0
Misc Extra Refrigerator EF 21.9 ResStockArguments extra_refrigerator_present=true extra_refrigerator_location=auto extra_refrigerator_rated_annual_kwh=348 extra_refrigerator_usage_multiplier=1.0
Misc Extra Refrigerator EF 6.7 ResStockArguments extra_refrigerator_present=true extra_refrigerator_location=auto extra_refrigerator_rated_annual_kwh=1139 extra_refrigerator_usage_multiplier=1.0
Misc Extra Refrigerator None ResStockArguments extra_refrigerator_present=false extra_refrigerator_location=auto extra_refrigerator_rated_annual_kwh=0 extra_refrigerator_usage_multiplier=0
Misc Extra Refrigerator Void
Misc Freezer "EF 12, Average Installed" ResStockArguments freezer_present=true freezer_location=auto freezer_rated_annual_kwh=935 freezer_usage_multiplier=1.0
Expand Down Expand Up @@ -12595,13 +12595,13 @@ Range Spot Vent Hour Hour6 ResStockArguments kitchen_fans_quantity=auto kitchen_
Range Spot Vent Hour Hour7 ResStockArguments kitchen_fans_quantity=auto kitchen_fans_start_hour=7
Range Spot Vent Hour Hour8 ResStockArguments kitchen_fans_quantity=auto kitchen_fans_start_hour=8
Range Spot Vent Hour Hour9 ResStockArguments kitchen_fans_quantity=auto kitchen_fans_start_hour=9
Refrigerator EF 10.2 ResStockArguments refrigerator_present=true refrigerator_location=auto refrigerator_rated_annual_kwh=891
Refrigerator EF 10.2 ResStockArguments refrigerator_present=true refrigerator_location=auto refrigerator_rated_annual_kwh=748
Refrigerator EF 10.5 ResStockArguments refrigerator_present=true refrigerator_location=auto refrigerator_rated_annual_kwh=727
Refrigerator EF 15.9 ResStockArguments refrigerator_present=true refrigerator_location=auto refrigerator_rated_annual_kwh=480
Refrigerator EF 17.6 ResStockArguments refrigerator_present=true refrigerator_location=auto refrigerator_rated_annual_kwh=434
Refrigerator EF 19.9 ResStockArguments refrigerator_present=true refrigerator_location=auto refrigerator_rated_annual_kwh=400
Refrigerator EF 17.6 ResStockArguments refrigerator_present=true refrigerator_location=auto refrigerator_rated_annual_kwh=433
Refrigerator EF 19.9 ResStockArguments refrigerator_present=true refrigerator_location=auto refrigerator_rated_annual_kwh=383
Refrigerator EF 21.9 ResStockArguments refrigerator_present=true refrigerator_location=auto refrigerator_rated_annual_kwh=348
Refrigerator EF 6.7 ResStockArguments refrigerator_present=true refrigerator_location=auto refrigerator_rated_annual_kwh=1356
Refrigerator EF 6.7 ResStockArguments refrigerator_present=true refrigerator_location=auto refrigerator_rated_annual_kwh=1139
Refrigerator None ResStockArguments refrigerator_present=false refrigerator_location=auto refrigerator_rated_annual_kwh=0
Refrigerator Void
Refrigerator Usage Level 100% Usage ResStockArguments refrigerator_usage_multiplier=1.0
Expand Down
650 changes: 325 additions & 325 deletions test/base_results/baseline/annual/results_output.csv
View file

Large diffs are not rendered by default.

0 comments on commit 45178e1

Please sign in to comment.