Skip to content

Commit

Permalink
Merge pull request #947 from NREL/other-fuel-wh
Browse files Browse the repository at this point in the history 
Model wood fuel when sampling "Other Fuel" for WH and "Other" for HVAC
  • Loading branch information
@joseph-robertson
joseph-robertson committed Jul 11, 2023
2 parents dae0bc1 + 586943f commit 13e4862
Show file tree
Hide file tree
Showing 11 changed files with 70,177 additions and 70,224 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Features

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))

## ResStock v3.1.0
###### May 25, 2023 - [Diff](https://github.com/NREL/resstock/compare/v3.0.0...v3.1.0)
Expand Down
60 changes: 30 additions & 30 deletions docs/read_the_docs/source/workflow_outputs/csv_tables/simulation_outputs.csv
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Annual Name,Annual Units,Timeseries ResStock Name,Timeseries BuildStockBatch Name,Timeseries Units,Notes
report_simulation_output.end_use_coal_clothes_dryer_m_btu,MBtu,End Use: Coal: Clothes Dryer,end_use__coal__clothes_dryer__kwh,kBtu,
report_simulation_output.end_use_coal_fireplace_m_btu,MBtu,End Use: Coal: Fireplace,end_use__coal__fireplace__kwh,kBtu,
report_simulation_output.end_use_coal_generator_m_btu,MBtu,End Use: Coal: Generator,end_use__coal__generator__kwh,kBtu,
report_simulation_output.end_use_coal_grill_m_btu,MBtu,End Use: Coal: Grill,end_use__coal__grill__kwh,kBtu,
report_simulation_output.end_use_coal_heating_heat_pump_backup_m_btu,MBtu,End Use: Coal: Heating Heat Pump Backup,end_use__coal__heating_heat_pump_backup__kwh,kBtu,
report_simulation_output.end_use_coal_heating_m_btu,MBtu,End Use: Coal: Heating,end_use__coal__heating__kwh,kBtu,Excludes heat pump backup
report_simulation_output.end_use_coal_hot_water_m_btu,MBtu,End Use: Coal: Hot Water,end_use__coal__hot_water__kwh,kBtu,
report_simulation_output.end_use_coal_lighting_m_btu,MBtu,End Use: Coal: Lighting,end_use__coal__lighting__kwh,kBtu,
report_simulation_output.end_use_coal_mech_vent_preheating_m_btu,MBtu,End Use: Coal: Mech Vent Preheating,end_use__coal__mech_vent_preheating__kwh,kBtu,
report_simulation_output.end_use_coal_range_oven_m_btu,MBtu,End Use: Coal: Range/Oven,end_use__coal__range_oven__kwh,kBtu,
report_simulation_output.end_use_coal_clothes_dryer_m_btu,MBtu,End Use: Coal: Clothes Dryer,end_use__coal__clothes_dryer__kbtu,kBtu,
report_simulation_output.end_use_coal_fireplace_m_btu,MBtu,End Use: Coal: Fireplace,end_use__coal__fireplace__kbtu,kBtu,
report_simulation_output.end_use_coal_generator_m_btu,MBtu,End Use: Coal: Generator,end_use__coal__generator__kbtu,kBtu,
report_simulation_output.end_use_coal_grill_m_btu,MBtu,End Use: Coal: Grill,end_use__coal__grill__kbtu,kBtu,
report_simulation_output.end_use_coal_heating_heat_pump_backup_m_btu,MBtu,End Use: Coal: Heating Heat Pump Backup,end_use__coal__heating_heat_pump_backup__kbtu,kBtu,
report_simulation_output.end_use_coal_heating_m_btu,MBtu,End Use: Coal: Heating,end_use__coal__heating__kbtu,kBtu,Excludes heat pump backup
report_simulation_output.end_use_coal_hot_water_m_btu,MBtu,End Use: Coal: Hot Water,end_use__coal__hot_water__kbtu,kBtu,
report_simulation_output.end_use_coal_lighting_m_btu,MBtu,End Use: Coal: Lighting,end_use__coal__lighting__kbtu,kBtu,
report_simulation_output.end_use_coal_mech_vent_preheating_m_btu,MBtu,End Use: Coal: Mech Vent Preheating,end_use__coal__mech_vent_preheating__kbtu,kBtu,
report_simulation_output.end_use_coal_range_oven_m_btu,MBtu,End Use: Coal: Range/Oven,end_use__coal__range_oven__kbtu,kBtu,
report_simulation_output.end_use_electricity_battery_m_btu,MBtu,End Use: Electricity: Battery,end_use__electricity__battery__kwh,kWh,Positive value for charging (including efficiency losses); negative value for discharging
report_simulation_output.end_use_electricity_ceiling_fan_m_btu,MBtu,End Use: Electricity: Ceiling Fan,end_use__electricity__ceiling_fan__kwh,kWh,
report_simulation_output.end_use_electricity_clothes_dryer_m_btu,MBtu,End Use: Electricity: Clothes Dryer,end_use__electricity__clothes_dryer__kwh,kWh,
Expand Down Expand Up @@ -76,26 +76,26 @@ report_simulation_output.end_use_propane_hot_water_m_btu,MBtu,End Use: Propane:
report_simulation_output.end_use_propane_lighting_m_btu,MBtu,End Use: Propane: Lighting,end_use__propane__lighting__kbtu,kBtu,
report_simulation_output.end_use_propane_mech_vent_preheating_m_btu,MBtu,End Use: Propane: Mech Vent Preheating,end_use__propane__mech_vent_preheating__kbtu,kBtu,
report_simulation_output.end_use_propane_range_oven_m_btu,MBtu,End Use: Propane: Range/Oven,end_use__propane__range_oven__kbtu,kBtu,
report_simulation_output.end_use_wood_cord_clothes_dryer_m_btu,MBtu,End Use: Wood Cord: Clothes Dryer,end_use__wood_cord__clothes_dryer__kwh,kBtu,
report_simulation_output.end_use_wood_cord_fireplace_m_btu,MBtu,End Use: Wood Cord: Fireplace,end_use__wood_cord__fireplace__kwh,kBtu,
report_simulation_output.end_use_wood_cord_generator_m_btu,MBtu,End Use: Wood Cord: Generator,end_use__wood_cord__generator__kwh,kBtu,
report_simulation_output.end_use_wood_cord_grill_m_btu,MBtu,End Use: Wood Cord: Grill,end_use__wood_cord__grill__kwh,kBtu,
report_simulation_output.end_use_wood_cord_heating_heat_pump_backup_m_btu,MBtu,End Use: Wood Cord: Heating Heat Pump Backup,end_use__wood_cord__heating_heat_pump_backup__kwh,kBtu,
report_simulation_output.end_use_wood_cord_heating_m_btu,MBtu,End Use: Wood Cord: Heating,end_use__wood_cord__heating__kwh,kBtu,Excludes heat pump backup
report_simulation_output.end_use_wood_cord_hot_water_m_btu,MBtu,End Use: Wood Cord: Hot Water,end_use__wood_cord__hot_water__kwh,kBtu,
report_simulation_output.end_use_wood_cord_lighting_m_btu,MBtu,End Use: Wood Cord: Lighting,end_use__wood_cord__lighting__kwh,kBtu,
report_simulation_output.end_use_wood_cord_mech_vent_preheating_m_btu,MBtu,End Use: Wood Cord: Mech Vent Preheating,end_use__wood_cord__mech_vent_preheating__kwh,kBtu,
report_simulation_output.end_use_wood_cord_range_oven_m_btu,MBtu,End Use: Wood Cord: Range/Oven,end_use__wood_cord__range_oven__kwh,kBtu,
report_simulation_output.end_use_wood_pellets_clothes_dryer_m_btu,MBtu,End Use: Wood Pellets: Clothes Dryer,end_use__wood_pellets__clothes_dryer__kwh,kBtu,
report_simulation_output.end_use_wood_pellets_fireplace_m_btu,MBtu,End Use: Wood Pellets: Fireplace,end_use__wood_pellets__fireplace__kwh,kBtu,
report_simulation_output.end_use_wood_pellets_generator_m_btu,MBtu,End Use: Wood Pellets: Generator,end_use__wood_pellets__generator__kwh,kBtu,
report_simulation_output.end_use_wood_pellets_grill_m_btu,MBtu,End Use: Wood Pellets: Grill,end_use__wood_pellets__grill__kwh,kBtu,
report_simulation_output.end_use_wood_pellets_heating_heat_pump_backup_m_btu,MBtu,End Use: Wood Pellets: Heating Heat Pump Backup,end_use__wood_pellets__heating_heat_pump_backup__kwh,kBtu,
report_simulation_output.end_use_wood_pellets_heating_m_btu,MBtu,End Use: Wood Pellets: Heating,end_use__wood_pellets__heating__kwh,kBtu,Excludes heat pump backup
report_simulation_output.end_use_wood_pellets_hot_water_m_btu,MBtu,End Use: Wood Pellets: Hot Water,end_use__wood_pellets__hot_water__kwh,kBtu,
report_simulation_output.end_use_wood_pellets_lighting_m_btu,MBtu,End Use: Wood Pellets: Lighting,end_use__wood_pellets__lighting__kwh,kBtu,
report_simulation_output.end_use_wood_pellets_mech_vent_preheating_m_btu,MBtu,End Use: Wood Pellets: Mech Vent Preheating,end_use__wood_pellets__mech_vent_preheating__kwh,kBtu,
report_simulation_output.end_use_wood_pellets_range_oven_m_btu,MBtu,End Use: Wood Pellets: Range/Oven,end_use__wood_pellets__range_oven__kwh,kBtu,
report_simulation_output.end_use_wood_cord_clothes_dryer_m_btu,MBtu,End Use: Wood Cord: Clothes Dryer,end_use__wood_cord__clothes_dryer__kbtu,kBtu,
report_simulation_output.end_use_wood_cord_fireplace_m_btu,MBtu,End Use: Wood Cord: Fireplace,end_use__wood_cord__fireplace__kbtu,kBtu,
report_simulation_output.end_use_wood_cord_generator_m_btu,MBtu,End Use: Wood Cord: Generator,end_use__wood_cord__generator__kbtu,kBtu,
report_simulation_output.end_use_wood_cord_grill_m_btu,MBtu,End Use: Wood Cord: Grill,end_use__wood_cord__grill__kbtu,kBtu,
report_simulation_output.end_use_wood_cord_heating_heat_pump_backup_m_btu,MBtu,End Use: Wood Cord: Heating Heat Pump Backup,end_use__wood_cord__heating_heat_pump_backup__kbtu,kBtu,
report_simulation_output.end_use_wood_cord_heating_m_btu,MBtu,End Use: Wood Cord: Heating,end_use__wood_cord__heating__kbtu,kBtu,Excludes heat pump backup
report_simulation_output.end_use_wood_cord_hot_water_m_btu,MBtu,End Use: Wood Cord: Hot Water,end_use__wood_cord__hot_water__kbtu,kBtu,
report_simulation_output.end_use_wood_cord_lighting_m_btu,MBtu,End Use: Wood Cord: Lighting,end_use__wood_cord__lighting__kbtu,kBtu,
report_simulation_output.end_use_wood_cord_mech_vent_preheating_m_btu,MBtu,End Use: Wood Cord: Mech Vent Preheating,end_use__wood_cord__mech_vent_preheating__kbtu,kBtu,
report_simulation_output.end_use_wood_cord_range_oven_m_btu,MBtu,End Use: Wood Cord: Range/Oven,end_use__wood_cord__range_oven__kbtu,kBtu,
report_simulation_output.end_use_wood_pellets_clothes_dryer_m_btu,MBtu,End Use: Wood Pellets: Clothes Dryer,end_use__wood_pellets__clothes_dryer__kbtu,kBtu,
report_simulation_output.end_use_wood_pellets_fireplace_m_btu,MBtu,End Use: Wood Pellets: Fireplace,end_use__wood_pellets__fireplace__kbtu,kBtu,
report_simulation_output.end_use_wood_pellets_generator_m_btu,MBtu,End Use: Wood Pellets: Generator,end_use__wood_pellets__generator__kbtu,kBtu,
report_simulation_output.end_use_wood_pellets_grill_m_btu,MBtu,End Use: Wood Pellets: Grill,end_use__wood_pellets__grill__kbtu,kBtu,
report_simulation_output.end_use_wood_pellets_heating_heat_pump_backup_m_btu,MBtu,End Use: Wood Pellets: Heating Heat Pump Backup,end_use__wood_pellets__heating_heat_pump_backup__kbtu,kBtu,
report_simulation_output.end_use_wood_pellets_heating_m_btu,MBtu,End Use: Wood Pellets: Heating,end_use__wood_pellets__heating__kbtu,kBtu,Excludes heat pump backup
report_simulation_output.end_use_wood_pellets_hot_water_m_btu,MBtu,End Use: Wood Pellets: Hot Water,end_use__wood_pellets__hot_water__kbtu,kBtu,
report_simulation_output.end_use_wood_pellets_lighting_m_btu,MBtu,End Use: Wood Pellets: Lighting,end_use__wood_pellets__lighting__kbtu,kBtu,
report_simulation_output.end_use_wood_pellets_mech_vent_preheating_m_btu,MBtu,End Use: Wood Pellets: Mech Vent Preheating,end_use__wood_pellets__mech_vent_preheating__kbtu,kBtu,
report_simulation_output.end_use_wood_pellets_range_oven_m_btu,MBtu,End Use: Wood Pellets: Range/Oven,end_use__wood_pellets__range_oven__kbtu,kBtu,
report_simulation_output.energy_use_net_m_btu,MBtu,Energy Use: Net,energy_use__net__kbtu,kBtu,Subtracts any power produced by PV or generators.
report_simulation_output.energy_use_total_m_btu,MBtu,Energy Use: Total,energy_use__total__kbtu,kBtu,Includes any battery charging/discharging
report_simulation_output.fuel_use_coal_total_m_btu,MBtu,Fuel Use: Coal: Total,fuel_use__coal__total__kwh,kBtu,"Includes 'coal', 'anthracite coal', 'bituminous coal', and 'coke'."
Expand Down
52 changes: 2 additions & 50 deletions measures/UpgradeCosts/measure.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<schema_version>3.1</schema_version>
<name>upgrade_costs</name>
<uid>ef51212c-acc4-48d7-9b29-cf2a5c6c4449</uid>
<version_id>4e7f4454-fa66-43ae-9900-0baef420c0a4</version_id>
<version_modified>2023-06-06T20:17:26Z</version_modified>
<version_id>c08d5898-10f4-4e59-8819-1a765bb3b13e</version_id>
<version_modified>2023-06-28T20:58:10Z</version_modified>
<xml_checksum>9BF1E6AC</xml_checksum>
<class_name>UpgradeCosts</class_name>
<display_name>Upgrade Costs</display_name>
Expand Down Expand Up @@ -119,12 +119,6 @@
<usage_type>test</usage_type>
<checksum>B9183037</checksum>
</file>
<file>
<filename>SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH.xml</filename>
<filetype>xml</filetype>
<usage_type>test</usage_type>
<checksum>0D548264</checksum>
</file>
<file>
<filename>SFD_1story_FB_UA_GRG_RoomAC_ElecBoiler_FuelTanklessWH.osw</filename>
<filetype>osw</filetype>
Expand All @@ -149,24 +143,12 @@
<usage_type>test</usage_type>
<checksum>546A7C2B</checksum>
</file>
<file>
<filename>SFD_1story_UB_UA_GRG_ACV_FuelFurnace_PortableHeater_HPWH.xml</filename>
<filetype>xml</filetype>
<usage_type>test</usage_type>
<checksum>833CC971</checksum>
</file>
<file>
<filename>SFD_2story_CS_UA_AC2_FuelBoiler_FuelTankWH.osw</filename>
<filetype>osw</filetype>
<usage_type>test</usage_type>
<checksum>B57303D3</checksum>
</file>
<file>
<filename>SFD_2story_CS_UA_AC2_FuelBoiler_FuelTankWH.xml</filename>
<filetype>xml</filetype>
<usage_type>test</usage_type>
<checksum>0F3782A4</checksum>
</file>
<file>
<filename>SFD_2story_CS_UA_GRG_ASHPV_FuelTanklessWH.osw</filename>
<filetype>osw</filetype>
Expand All @@ -179,12 +161,6 @@
<usage_type>test</usage_type>
<checksum>986E1AAD</checksum>
</file>
<file>
<filename>SFD_2story_FB_UA_GRG_AC1_ElecBaseboard_FuelTankWH.xml</filename>
<filetype>xml</filetype>
<usage_type>test</usage_type>
<checksum>C7D4CB36</checksum>
</file>
<file>
<filename>SFD_2story_FB_UA_GRG_AC1_UnitHeater_FuelTankWH.osw</filename>
<filetype>osw</filetype>
Expand All @@ -203,12 +179,6 @@
<usage_type>test</usage_type>
<checksum>E7CB80D0</checksum>
</file>
<file>
<filename>SFD_2story_PB_UA_ElecFurnace_ElecTankWH.xml</filename>
<filetype>xml</filetype>
<usage_type>test</usage_type>
<checksum>0D3DDBFD</checksum>
</file>
<file>
<filename>SFD_2story_S_UA_GRG_ASHP1_Fireplace_FuelTanklessWH.osw</filename>
<filetype>osw</filetype>
Expand All @@ -227,24 +197,6 @@
<usage_type>test</usage_type>
<checksum>B165DD4B</checksum>
</file>
<file>
<filename>in.epw</filename>
<filetype>epw</filetype>
<usage_type>test</usage_type>
<checksum>E23378AA</checksum>
</file>
<file>
<filename>in.osm</filename>
<filetype>osm</filetype>
<usage_type>test</usage_type>
<checksum>53BF4341</checksum>
</file>
<file>
<filename>in.xml</filename>
<filetype>xml</filetype>
<usage_type>test</usage_type>
<checksum>ADFEC933</checksum>
</file>
<file>
<filename>upgrade_costs_test.rb</filename>
<filetype>rb</filetype>
Expand Down

0 comments on commit 13e4862

Please sign in to comment.