Skip to content

Commit

Permalink
Update measures and tweak meas gen code
Browse files Browse the repository at this point in the history 
Add a ‘global_exit_flag’ attribute that flags measures for exclusion from the market when a minimum performance floor is imposed in a certain year via ‘floor_start’ user option. (If this attribute is missing or None, measure will not be subject to exclusion via that floor option.)

Key measure changes:

* Add minimum efficiency FS measures (ASHPs, WH, boilers, cooking, drying) to the measure set.
* Add specific secondary fossil heating + envelope packages to measure set.
* Remove added electrical infrastructure costs for dual fuel res. Measures.
* Add electrical infrastructure costs for 240V HPWH measure, remove added circuit cost for HPWH TS measure.
* Remove commercial roofs measure, which was not generating energy savings relative to baseline.
* Breakout envelope measure performance by IECC climate zone (vs. AIA) where relevant.
* Add RTAC to cooling option for existing measures that pair chillers with heating.
* Ensure BTO RDO measures are consistent with latest roadmap measure definitions, including separating out infiltration from walls.
* Adjust cooking measure efficiency to be consistent with EIA docs.

In measure code, add checks for integers for market entry/exit year, and ensure that zero values are not inadvertently set to None in converting the CSV data to JSON format.
  • Loading branch information
@jtlangevin
jtlangevin committed Oct 28, 2024
1 parent dd87df0 commit 91de74b
Show file tree
Hide file tree
Showing 178 changed files with 4,022 additions and 1,207 deletions.
480 changes: 294 additions & 186 deletions ecm_definitions/meas_pkg_gen_io/inputs/meas_in.csv
View file

Large diffs are not rendered by default.

155 changes: 65 additions & 90 deletions ecm_definitions/meas_pkg_gen_io/inputs/pkg_in.csv
View file
Original file line number Diff line number Diff line change
@@ -1,121 +1,96 @@
Name,Measures in Package,Additional Energy Savings,Energy Savings Source Notes,Energy Savings Source Details,Additional Cost Reductions,Cost Reductions Source Notes,Cost Reductions Source Details
(R) ES HP Pt. FS (Oth. Fs. Frn.) & Env.,"(R) ESTAR HP Pt. FS (Other Fossil Furnace)
Category,Scenario(s),Name,Measures in Package,Additional Energy Savings,Energy Savings Source Notes,Energy Savings Source Details,Additional Cost Reductions,Cost Reductions Source Notes,Cost Reductions Source Details
Residential,"Mid, High, Breakthrough",(R) ES HP Pt. FS (Oth. Fs. Frn.) & Env.,"(R) ESTAR HP Pt. FS (Other Fossil Furnace)
(R) IECC 2021 Walls & Air Sealing",,,,,,
(R) ES HP Pt. FS (NG Frn.) & Env.,"(R) ESTAR HP Pt. FS (NG Furnace)
Residential,"Mid, High, Breakthrough",(R) ES HP Pt. FS (NG Frn.) & Env.,"(R) ESTAR HP Pt. FS (NG Furnace)
(R) IECC 2021 Walls & Air Sealing",,,,,,
(R) ES HP FS (Oth. Fs. Frn.) & Env.,"(R) ESTAR HP FS (Other Fossil Furnace)
Residential,"Mid, High, Breakthrough",(R) ES HP FS (Oth. Fs. Frn.) & Env.,"(R) ESTAR HP FS (Other Fossil Furnace)
(R) IECC 2021 Walls & Air Sealing",,,,,,
(R) ES HP FS (NG Frn.) & Env.,"(R) ESTAR HP FS (NG Furnace)
Residential,"Mid, High, Breakthrough",(R) ES HP FS (NG Frn.) & Env.,"(R) ESTAR HP FS (NG Furnace)
(R) IECC 2021 Walls & Air Sealing",,,,,,
(R) ES GSHP (Oth. Fs. Frn.) & Env.,"(R) ESTAR GSHP (Other Fossil Furnace)
Residential,"Mid, High, Breakthrough",(R) ES GSHP (Oth. Fs. Frn.) & Env.,"(R) ESTAR GSHP (Other Fossil Furnace)
(R) IECC 2021 Walls & Air Sealing",,,,,,
(R) ES GSHP (NG Frn.) & Env.,"(R) ESTAR GSHP (NG Furnace)
Residential,"Mid, High, Breakthrough",(R) ES GSHP (NG Frn.) & Env.,"(R) ESTAR GSHP (NG Furnace)
(R) IECC 2021 Walls & Air Sealing",,,,,,
(R) ES HP TS (Resist.) & Env.,"(R) ESTAR HP TS (Resist.)
Residential,"Mid, High, Breakthrough",(R) ES HP TS (Resist.) & Env.,"(R) ESTAR HP TS (Resist.)
(R) IECC 2021 Walls & Air Sealing",,,,,,
(R) Bst. HP FS (Oth. Fs. Frn.) & Env.,"(R) Best HP FS (Other Fossil Furnace)
Residential,"Mid, High, Breakthrough",(R) Ref. Case Scnd. Fossil Heat FS & Env.,"(R) Electric FS (Secondary Fossil Heating)
(R) IECC 2021 Walls & Air Sealing",,,,,,
(R) Bst. HP FS (Oth. Fs. Bl.) & Env.,"(R) Best HP FS (Other Fossil Boiler)
Residential,"Mid, High, Breakthrough",(R) Ref. Case Scnd. Elec. Heat & Env.,"(R) Ref. Case Secondary Electric Heating
(R) IECC 2021 Walls & Air Sealing",,,,,,
(R) Bst. HP FS (NG Frn.) & Env.,"(R) Best HP FS (NG Furnace)
(R) IECC 2021 Walls & Air Sealing",,,,,,
(R) Bst. HP FS (NG Boiler) & Env.,"(R) Best HP FS (NG Boiler)
(R) IECC 2021 Walls & Air Sealing",,,,,,
(R) Bst. HP TS (Resist.) & Env.,"(R) Best HP TS (Resist.)
(R) IECC 2021 Walls & Air Sealing",,,,,,
(C) ES HP Pt. FS (Oth. Fs. Frn.) & Env.,"(C) ESTAR HP Pt. FS (Other Fossil Furnace)
(C) IECC 2021 Walls & Air Sealing",,,,,,
(C) ES HP Pt. FS (NG Frn.) & Env.,"(C) ESTAR HP Pt. FS (NG Furnace)
(C) IECC 2021 Walls & Air Sealing",,,,,,
(C) ES HP FS (Oth. Fs. Frn.) & Env.,"(C) ESTAR HP FS (Other Fossil Furnace)
(C) IECC 2021 Walls & Air Sealing",,,,,,
(C) ES HP FS (NG Frn.) & Env.,"(C) ESTAR HP FS (NG Furnace)
(C) IECC 2021 Walls & Air Sealing",,,,,,
"(C) ES HP Pt. FS (RTU, Oth. Fs. Ht.) & Env.","(C) ESTAR HP Pt. FS (RTU, Other Fossil Heat)
(C) IECC 2021 Walls & Air Sealing",,,,,,
"(C) ES HP Pt. FS (RTU, NG Ht.) & Env.","(C) ESTAR HP Pt. FS (RTU, NG Heat)
(C) IECC 2021 Walls & Air Sealing",,,,,,
"(C) ES HP FS (RTU, Oth. Fs. Ht.) & Env.","(C) ESTAR HP FS (RTU, Other Fossil Heat)
(C) IECC 2021 Walls & Air Sealing",,,,,,
"(C) ES HP FS (RTU, NG Ht.) & Env.","(C) ESTAR HP FS (RTU, NG Heat)
(C) IECC 2021 Walls & Air Sealing",,,,,,
(C) Bst. HP FS (Oth. Fs. Frn. AC) & Env.,"(C) Best HP FS (Other Fossil Furnace & AC)
(C) IECC 2021 Walls & Air Sealing",,,,,,
(C) Bst. HP FS (NG Frn. AC) & Env.,"(C) Best HP FS (NG Furnace & AC)
(C) IECC 2021 Walls & Air Sealing",,,,,,
"(C) Bst. HP FS (RTU, Oth. Fs. Ht.) & Env.","(C) Best HP FS (RTU, Other Fossil Heat)
(C) IECC 2021 Walls & Air Sealing",,,,,,
"(C) Bst. HP FS (RTU, NG Ht.) & Env.","(C) Best HP FS (RTU, NG Heat)
(C) IECC 2021 Walls & Air Sealing",,,,,,
(C) Bst. HP FS (Oth. Fs. Bl.) & Env.,"(C) Best HP FS (Other Fossil Boiler)
(C) IECC 2021 Walls & Air Sealing",,,,,,
(C) Bst. HP FS (NG Boiler) & Env.,"(C) Best HP FS (NG Boiler)
(C) IECC 2021 Walls & Air Sealing",,,,,,
(R) Bst. HP FS (Oth. Fs. Frn.) & Env.+,"(R) Best HP FS (Other Fossil Furnace)
Commercial,"Mid, High, Breakthrough","(C) ES HP FS (RTU, Oth. Fs. Ht.) & Env.","(C) ESTAR HP FS (RTU, Other Fossil Heat)
(C) 90.1-2022 Walls & Air Sealing",,,,,,
Commercial,"Mid, High, Breakthrough","(C) ES HP FS (RTU, NG Ht.) & Env.","(C) ESTAR HP FS (RTU, NG Heat)
(C) 90.1-2022 Walls & Air Sealing",,,,,,
Residential,"Mid, High, Breakthrough",(R) Bst. HP FS (Oth. Fs. Frn.) & Env.+,"(R) Best HP FS (Other Fossil Furnace)
(R) IECC 2021 Walls & Air Sealing
(R) IECC 2021 Roofs
(R) ENERGY STAR Windows",,,,,,
(R) Bst. HP FS (Oth. Fs. Bl.) & Env.+,"(R) Best HP FS (Other Fossil Boiler)
Residential,"Mid, High, Breakthrough",(R) Bst. HP FS (NG Frn.) & Env.+,"(R) Best HP FS (NG Furnace)
(R) IECC 2021 Walls & Air Sealing
(R) IECC 2021 Roofs
(R) ENERGY STAR Windows",,,,,,
(R) Bst. HP FS (NG Frn.) & Env.+,"(R) Best HP FS (NG Furnace)
Residential,"Mid, High, Breakthrough",(R) Bst. HP FS (NG Boiler) & Env.+,"(R) Best HP FS (NG Boiler)
(R) IECC 2021 Walls & Air Sealing
(R) IECC 2021 Roofs
(R) ENERGY STAR Windows",,,,,,
(R) Bst. HP FS (NG Boiler) & Env.+,"(R) Best HP FS (NG Boiler)
Residential,"Mid, High, Breakthrough",(R) Bst. HP TS (Resist.) & Env.+,"(R) Best HP TS (Resist.)
(R) IECC 2021 Walls & Air Sealing
(R) IECC 2021 Roofs
(R) ENERGY STAR Windows",,,,,,
(R) Bst. HP TS (Resist.) & Env.+,"(R) Best HP TS (Resist.)
Residential,"Mid, High, Breakthrough",(R) Ref. Case Scnd. Fossil Heat FS & Env.+,"(R) Electric FS (Secondary Fossil Heating)
(R) IECC 2021 Walls & Air Sealing
(R) IECC 2021 Roofs
(R) ENERGY STAR Windows",,,,,,
(C) Bst. HP FS (Oth. Fs. Frn. AC) & Env.+,"(C) Best HP FS (Other Fossil Furnace & AC)
(C) IECC 2021 Walls & Air Sealing
(C) 90.1-2022 Roofs
(C) 90.1-2022 Windows",,,,,,
(C) Bst. HP FS (NG Frn. AC) & Env.+,"(C) Best HP FS (NG Furnace & AC)
(C) IECC 2021 Walls & Air Sealing
(C) 90.1-2022 Roofs
(C) 90.1-2022 Windows",,,,,,
"(C) Bst. HP FS (RTU, Oth. Fs. Ht.) & Env.+","(C) Best HP FS (RTU, Other Fossil Heat)
(C) IECC 2021 Walls & Air Sealing
(C) 90.1-2022 Roofs
(C) 90.1-2022 Windows",,,,,,
"(C) Bst. HP FS (RTU, NG Ht.) & Env.+","(C) Best HP FS (RTU, NG Heat)
(C) IECC 2021 Walls & Air Sealing
(C) 90.1-2022 Roofs
Residential,"Mid, High, Breakthrough",(R) Ref. Case Scnd. Elec. Heat & Env.+,"(R) Ref. Case Secondary Electric Heating
(R) IECC 2021 Walls & Air Sealing
(R) IECC 2021 Roofs
(R) ENERGY STAR Windows",,,,,,
Commercial,"Mid, High, Breakthrough","(C) Bst. HP FS (RTU, Oth. Fs. Ht.) & Env.+","(C) Best HP FS (RTU, Other Fossil Heat)
(C) 90.1-2022 Walls & Air Sealing
(C) 90.1-2022 Windows",,,,,,
(C) Bst. HP FS (Oth. Fs. Bl.) & Env.+,"(C) Best HP FS (Other Fossil Boiler)
(C) IECC 2021 Walls & Air Sealing
(C) 90.1-2022 Roofs
Commercial,"Mid, High, Breakthrough","(C) Bst. HP FS (RTU, NG Ht.) & Env.+","(C) Best HP FS (RTU, NG Heat)
(C) 90.1-2022 Walls & Air Sealing
(C) 90.1-2022 Windows",,,,,,
(C) Bst. HP FS (NG Boiler) & Env.+,"(C) Best HP FS (NG Boiler)
(C) IECC 2021 Walls & Air Sealing
(C) 90.1-2022 Roofs
Commercial,"Mid, High, Breakthrough",(C) Bst. HP FS (NG Boiler) & Env.+,"(C) Best HP FS (NG Boiler)
(C) 90.1-2022 Walls & Air Sealing
(C) 90.1-2022 Windows",,,,,,
(R) Brk. HP FS (Oth. Fs. Frn.) & Env.++,"(R) Brk. HP FS (Other Fossil Furnace)
(R) BTO RDO Walls & Air Sealing
(R) BTO RDO Windows",,,,,,
(R) Brk. HP FS (Oth. Fs. Bl.) & Env.++,"(R) Brk. HP FS (Other Fossil Boiler)
(R) IECC 2021 Walls & Air Sealing
(R) BTO RDO Walls & Air Sealing
(R) BTO RDO Windows",,,,,,
(R) Brk. HP FS (NG Frn.) & Env.++,"(R) Brk. HP FS (NG Furnace)
(R) BTO RDO Walls & Air Sealing
(R) BTO RDO Windows",,,,,,
(R) Brk. HP FS (NG Boiler) & Env.++,"(R) Brk. HP FS (NG Boiler)
(R) BTO RDO Walls & Air Sealing
(R) BTO RDO Windows",,,,,,
(R) Brk. HP FS (Resist.) & Env.++,"(R) Brk. HP FS (Resist.)
(R) BTO RDO Walls & Air Sealing
(R) BTO RDO Windows",,,,,,
(C) Brk. HP FS (Oth. Fs. Frn. AC) & Env.++,"(C) Brk. HP FS (Other Fossil Furnace & AC)
(C) BTO RDO Walls & Infiltration
Residential,Breakthrough,(R) Brk. HP FS (Oth. Fs. Frn.) & Env.++,"(R) Brk. HP FS (Other Fossil Furnace)
(R) BTO RDO Walls
(R) BTO RDO Air Sealing
(R) BTO RDO Windows
(R) BTO RDO Foundations",,,,,,
Residential,Breakthrough,(R) Brk. HP FS (NG Frn.) & Env.++,"(R) Brk. HP FS (NG Furnace)
(R) BTO RDO Walls
(R) BTO RDO Air Sealing
(R) BTO RDO Windows
(R) BTO RDO Foundations",,,,,,
Residential,Breakthrough,(R) Brk. HP FS (NG Boiler) & Env.++,"(R) Brk. HP FS (NG Boiler)
(R) BTO RDO Walls
(R) BTO RDO Air Sealing
(R) BTO RDO Windows
(R) BTO RDO Foundations",,,,,,
Residential,Breakthrough,(R) Brk. HP TS (Resist.) & Env.++,"(R) Brk. HP TS (Resist.)
(R) BTO RDO Walls
(R) BTO RDO Air Sealing
(R) BTO RDO Windows
(R) BTO RDO Foundations",,,,,,
Residential,Breakthrough,(R) Ref. Case Scnd. Fossil Heat FS & Env.++,"(R) Electric FS (Secondary Fossil Heating)
(R) BTO RDO Walls
(R) BTO RDO Air Sealing
(R) BTO RDO Windows
(R) BTO RDO Foundations",,,,,,
Residential,Breakthrough,(R) Ref. Case Scnd. Elec. Heat & Env.++,"(R) Ref. Case Secondary Electric Heating
(R) BTO RDO Walls
(R) BTO RDO Air Sealing
(R) BTO RDO Windows
(R) BTO RDO Foundations",,,,,,
Commercial,Breakthrough,(C) Brk. HP FS (Oth. Fs. Frn. AC) & Env.++,"(C) Brk. HP FS (Other Fossil Furnace & AC)
(C) BTO RDO Walls
(C) BTO RDO Air Sealing (Exist)
(C) BTO RDO Roofs
(C) BTO RDO Windows",,,,,,
(C) Brk. HP FS (NG Frn. AC) & Env.++,"(C) Brk. HP FS (NG Furnace & AC)
(C) BTO RDO Walls & Infiltration
Commercial,Breakthrough,(C) Brk. HP FS (NG Frn. AC) & Env.++,"(C) Brk. HP FS (NG Furnace & AC)
(C) BTO RDO Walls
(C) BTO RDO Air Sealing (Exist)
(C) BTO RDO Roofs
(C) BTO RDO Windows",,,,,,
3 changes: 2 additions & 1 deletion ecm_definitions/meas_pkg_gen_io/outputs/(C) 90.1 Lighting.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"measure_type": "add-on",
"market_entry_year": 2024,
"market_exit_year": null,
"global_exit_flag": null,
"climate_zone": "all",
"bldg_type": "all commercial",
"structure_type": "all",
Expand Down Expand Up @@ -94,6 +95,6 @@
"name": "Aven Satre:Meloy",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2024-09-05 16:27:58"
"timestamp": "2024-10-25 05:57:34"
}
}
3 changes: 2 additions & 1 deletion ecm_definitions/meas_pkg_gen_io/outputs/(C) 90.1 Plug Loads.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"measure_type": "add-on",
"market_entry_year": 2024,
"market_exit_year": null,
"global_exit_flag": null,
"climate_zone": "all",
"bldg_type": "all commercial",
"structure_type": "all",
Expand Down Expand Up @@ -62,6 +63,6 @@
"name": "Aven Satre:Meloy",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2024-09-05 16:27:58"
"timestamp": "2024-10-25 05:57:34"
}
}
88 changes: 0 additions & 88 deletions ecm_definitions/meas_pkg_gen_io/outputs/(C) 90.1-2022 Roofs.json
View file

This file was deleted.

Loading

0 comments on commit 91de74b

Please sign in to comment.