Skip to content

Commit 9e22c4a

Browse files
jtlangevinjtlangevin
committed
Support modifications of AEO incentive levels
Create and process new data (./scout/supporting_data/sub_fed/incentives.csv) to allow users to remove, extend, or replace AEO incentive levels for specific msegs in the Scout forecast. A new function, import_state_data, was written in ecm_prep to read in and finalize the inputs for incentives modifications and (in the future) modifications to rates in one place. Additionally, “federal” and “non-federal” branches on the existing residential incentives levels were added that split out the previously summed incentives across these dimensions, to allow more flexibility in making modifications to federal vs. sub-federal residential incentive levels for the residential sector (commercial incentives are not split out in this way in the AEO data.) Users may modify incentive levels for a given applicable baseline segment or segment that a measure is switching to in three ways: * Remove: exclude the AEO incentive from consideration beginning in a given start year (or for all years). * Replace: if there is no removal (first bullet), specify a custom federal or state-level incentive that replaces any AEO incentive level previously specified for the given segment. * Extend: if there is no removal or replacement (first and second bullets), find the largest level of the AEO incentive in years prior to a given start year and extend it through a given end year, possibly with a multiplier added on top of the existing AEO incentive. For replacements of existing incentives for fuel switching, a user input determines whether the incentive allows the original fuel equipment to be retained as backup. For replacements, users must also specify information about how to qualify for the incentive – a performance threshold and units and the incentive level itself, which is either a % credit on installed cost or rebate $ decremented from installed cost. Users may specify modifications to federal and sub-federal incentives separately, or can specify a modification that applies to both. For sub-state-level incentives modifications, users may specify an applicable fraction that downscales the modification’s impact to only the portion of a state’s energy use that is affected by a sub-state policy. An additional reference case measure flag, “ref_case_flag” was needed to ensure that incentives process correctly for add-on reference case measures (all add-on measures were previously excluded to prevent attempts to process incentives for, e.g., controls measures with relative % savings units, however ref. case measures are often defined as add-ons with zero performance or cost additions to the baseline and incentives should be assigned to these measures). The measure set was regenerated with this flag reflected. Addresses issue #410.
1 parent 6cbd2b8 commit 9e22c4a

File tree

351 files changed

+1677
-757
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

351 files changed

+1677
-757
lines changed

‎ecm_definitions/(C) 90.1 Lighting.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"market_entry_year": 2024,
66
"market_exit_year": null,
77
"min_eff_elec_flag": null,
8+
"ref_case_flag": null,
89
"climate_zone": "all",
910
"bldg_type": "all commercial",
1011
"structure_type": "all",
@@ -95,6 +96,6 @@
9596
"name": "Aven Satre:Meloy",
9697
"organization": "LBNL",
9798
"email": "[email protected]",
98-
"timestamp": "2025-01-21 17:41:02"
99+
"timestamp": "2025-01-28 12:05:22"
99100
}
100101
}

‎ecm_definitions/(C) 90.1 Plug Loads.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"market_entry_year": 2024,
66
"market_exit_year": null,
77
"min_eff_elec_flag": null,
8+
"ref_case_flag": null,
89
"climate_zone": "all",
910
"bldg_type": "all commercial",
1011
"structure_type": "all",
@@ -63,6 +64,6 @@
6364
"name": "Aven Satre:Meloy",
6465
"organization": "LBNL",
6566
"email": "[email protected]",
66-
"timestamp": "2025-01-21 17:41:02"
67+
"timestamp": "2025-01-28 12:05:22"
6768
}
6869
}

‎ecm_definitions/(C) 90.1-2022 Walls & Air Sealing.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"market_entry_year": 2024,
66
"market_exit_year": null,
77
"min_eff_elec_flag": null,
8+
"ref_case_flag": null,
89
"climate_zone": "all",
910
"bldg_type": [
1011
"assembly",
@@ -139,6 +140,6 @@
139140
"name": "Jared Langevin",
140141
"organization": "LBNL",
141142
"email": "[email protected]",
142-
"timestamp": "2025-01-21 17:41:02"
143+
"timestamp": "2025-01-28 12:05:22"
143144
}
144145
}

‎ecm_definitions/(C) 90.1-2022 Windows.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"market_entry_year": 2024,
66
"market_exit_year": null,
77
"min_eff_elec_flag": null,
8+
"ref_case_flag": null,
89
"climate_zone": "all",
910
"bldg_type": [
1011
"assembly",
@@ -124,6 +125,6 @@
124125
"name": "Jared Langevin",
125126
"organization": "LBNL",
126127
"email": "[email protected]",
127-
"timestamp": "2025-01-21 17:41:02"
128+
"timestamp": "2025-01-28 12:05:22"
128129
}
129130
}

‎ecm_definitions/(C) BTO RDO Air Sealing (Exist).json

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"market_entry_year": 2040,
99
"market_exit_year": null,
1010
"min_eff_elec_flag": null,
11+
"ref_case_flag": null,
1112
"climate_zone": "all",
1213
"bldg_type": [
1314
"assembly",
@@ -73,6 +74,6 @@
7374
"name": "Jared Langevin",
7475
"organization": "LBNL",
7576
"email": "[email protected]",
76-
"timestamp": "2025-01-21 17:41:02"
77+
"timestamp": "2025-01-28 12:05:22"
7778
}
7879
}

‎ecm_definitions/(C) BTO RDO Roofs.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"market_entry_year": 2040,
66
"market_exit_year": null,
77
"min_eff_elec_flag": null,
8+
"ref_case_flag": null,
89
"climate_zone": "all",
910
"bldg_type": [
1011
"assembly",
@@ -85,6 +86,6 @@
8586
"name": "Jared Langevin",
8687
"organization": "LBNL",
8788
"email": "[email protected]",
88-
"timestamp": "2025-01-21 17:41:02"
89+
"timestamp": "2025-01-28 12:05:22"
8990
}
9091
}

‎ecm_definitions/(C) BTO RDO Walls.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"market_entry_year": 2040,
66
"market_exit_year": null,
77
"min_eff_elec_flag": null,
8+
"ref_case_flag": null,
89
"climate_zone": "all",
910
"bldg_type": [
1011
"assembly",
@@ -70,6 +71,6 @@
7071
"name": "Jared Langevin",
7172
"organization": "LBNL",
7273
"email": "[email protected]",
73-
"timestamp": "2025-01-21 17:41:02"
74+
"timestamp": "2025-01-28 12:05:22"
7475
}
7576
}

‎ecm_definitions/(C) BTO RDO Windows.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"market_entry_year": 2035,
66
"market_exit_year": null,
77
"min_eff_elec_flag": null,
8+
"ref_case_flag": null,
89
"climate_zone": "all",
910
"bldg_type": [
1011
"assembly",
@@ -113,6 +114,6 @@
113114
"name": "Jared Langevin",
114115
"organization": "LBNL",
115116
"email": "[email protected]",
116-
"timestamp": "2025-01-21 17:41:02"
117+
"timestamp": "2025-01-28 12:05:22"
117118
}
118119
}

‎ecm_definitions/(C) Best HP FS (NG Boiler).json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"market_entry_year": 2024,
66
"market_exit_year": null,
77
"min_eff_elec_flag": null,
8+
"ref_case_flag": null,
89
"climate_zone": "all",
910
"bldg_type": "all commercial",
1011
"structure_type": "all",
@@ -119,6 +120,6 @@
119120
"name": "Jared Langevin",
120121
"organization": "LBNL",
121122
"email": "[email protected]",
122-
"timestamp": "2025-01-21 17:41:02"
123+
"timestamp": "2025-01-28 12:05:22"
123124
}
124125
}

‎ecm_definitions/(C) Best HP FS (NG Furnace & AC).json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"market_entry_year": 2024,
66
"market_exit_year": null,
77
"min_eff_elec_flag": null,
8+
"ref_case_flag": null,
89
"climate_zone": "all",
910
"bldg_type": "all commercial",
1011
"structure_type": "all",
@@ -136,6 +137,6 @@
136137
"name": "Jared Langevin",
137138
"organization": "LBNL",
138139
"email": "[email protected]",
139-
"timestamp": "2025-01-21 17:41:02"
140+
"timestamp": "2025-01-28 12:05:22"
140141
}
141142
}

‎ecm_definitions/(C) Best HP FS (Other Fossil Boiler).json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"market_entry_year": 2024,
66
"market_exit_year": null,
77
"min_eff_elec_flag": null,
8+
"ref_case_flag": null,
89
"climate_zone": "all",
910
"bldg_type": "all commercial",
1011
"structure_type": "all",
@@ -117,6 +118,6 @@
117118
"name": "Jared Langevin",
118119
"organization": "LBNL",
119120
"email": "[email protected]",
120-
"timestamp": "2025-01-21 17:41:02"
121+
"timestamp": "2025-01-28 12:05:22"
121122
}
122123
}

‎ecm_definitions/(C) Best HP FS (Other Fossil Furnace & AC).json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"market_entry_year": 2024,
66
"market_exit_year": null,
77
"min_eff_elec_flag": null,
8+
"ref_case_flag": null,
89
"climate_zone": "all",
910
"bldg_type": "all commercial",
1011
"structure_type": "all",
@@ -143,6 +144,6 @@
143144
"name": "Jared Langevin",
144145
"organization": "LBNL",
145146
"email": "[email protected]",
146-
"timestamp": "2025-01-21 17:41:02"
147+
"timestamp": "2025-01-28 12:05:22"
147148
}
148149
}

‎ecm_definitions/(C) Best HP FS (RTU, NG Heat).json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"market_entry_year": 2024,
66
"market_exit_year": null,
77
"min_eff_elec_flag": null,
8+
"ref_case_flag": null,
89
"climate_zone": "all",
910
"bldg_type": "all commercial",
1011
"structure_type": "all",
@@ -120,6 +121,6 @@
120121
"name": "Jared Langevin",
121122
"organization": "LBNL",
122123
"email": "[email protected]",
123-
"timestamp": "2025-01-21 17:41:02"
124+
"timestamp": "2025-01-28 12:05:22"
124125
}
125126
}

‎ecm_definitions/(C) Best HP FS (RTU, Other Fossil Heat).json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"market_entry_year": 2024,
66
"market_exit_year": null,
77
"min_eff_elec_flag": null,
8+
"ref_case_flag": null,
89
"climate_zone": "all",
910
"bldg_type": "all commercial",
1011
"structure_type": "all",
@@ -118,6 +119,6 @@
118119
"name": "Jared Langevin",
119120
"organization": "LBNL",
120121
"email": "[email protected]",
121-
"timestamp": "2025-01-21 17:41:02"
122+
"timestamp": "2025-01-28 12:05:22"
122123
}
123124
}

‎ecm_definitions/(C) Best HP Pt. FS (NG Boiler).json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"market_entry_year": 2024,
66
"market_exit_year": null,
77
"min_eff_elec_flag": null,
8+
"ref_case_flag": null,
89
"climate_zone": "all",
910
"bldg_type": "all commercial",
1011
"structure_type": "all",
@@ -119,6 +120,6 @@
119120
"name": "Jared Langevin",
120121
"organization": "LBNL",
121122
"email": "[email protected]",
122-
"timestamp": "2025-01-21 17:41:02"
123+
"timestamp": "2025-01-28 12:05:22"
123124
}
124125
}

‎ecm_definitions/(C) Best HP Pt. FS (NG Furnace & AC).json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"market_entry_year": 2024,
66
"market_exit_year": null,
77
"min_eff_elec_flag": null,
8+
"ref_case_flag": null,
89
"climate_zone": "all",
910
"bldg_type": "all commercial",
1011
"structure_type": "all",
@@ -134,6 +135,6 @@
134135
"name": "Jared Langevin",
135136
"organization": "LBNL",
136137
"email": "[email protected]",
137-
"timestamp": "2025-01-21 17:41:02"
138+
"timestamp": "2025-01-28 12:05:22"
138139
}
139140
}

‎ecm_definitions/(C) Best HP Pt. FS (Other Fossil Boiler).json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"market_entry_year": 2024,
66
"market_exit_year": null,
77
"min_eff_elec_flag": null,
8+
"ref_case_flag": null,
89
"climate_zone": "all",
910
"bldg_type": "all commercial",
1011
"structure_type": "all",
@@ -117,6 +118,6 @@
117118
"name": "Jared Langevin",
118119
"organization": "LBNL",
119120
"email": "[email protected]",
120-
"timestamp": "2025-01-21 17:41:02"
121+
"timestamp": "2025-01-28 12:05:22"
121122
}
122123
}

‎ecm_definitions/(C) Best HP Pt. FS (Other Fossil Furnace & AC).json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"market_entry_year": 2024,
66
"market_exit_year": null,
77
"min_eff_elec_flag": null,
8+
"ref_case_flag": null,
89
"climate_zone": "all",
910
"bldg_type": "all commercial",
1011
"structure_type": "all",
@@ -141,6 +142,6 @@
141142
"name": "Jared Langevin",
142143
"organization": "LBNL",
143144
"email": "[email protected]",
144-
"timestamp": "2025-01-21 17:41:02"
145+
"timestamp": "2025-01-28 12:05:22"
145146
}
146147
}

‎ecm_definitions/(C) Best HP Pt. FS (RTU, NG Heat).json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"market_entry_year": 2024,
66
"market_exit_year": null,
77
"min_eff_elec_flag": null,
8+
"ref_case_flag": null,
89
"climate_zone": "all",
910
"bldg_type": "all commercial",
1011
"structure_type": "all",
@@ -120,6 +121,6 @@
120121
"name": "Jared Langevin",
121122
"organization": "LBNL",
122123
"email": "[email protected]",
123-
"timestamp": "2025-01-21 17:41:02"
124+
"timestamp": "2025-01-28 12:05:22"
124125
}
125126
}

‎ecm_definitions/(C) Best HP Pt. FS (RTU, Other Fossil Heat).json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"market_entry_year": 2024,
66
"market_exit_year": null,
77
"min_eff_elec_flag": null,
8+
"ref_case_flag": null,
89
"climate_zone": "all",
910
"bldg_type": "all commercial",
1011
"structure_type": "all",
@@ -118,6 +119,6 @@
118119
"name": "Jared Langevin",
119120
"organization": "LBNL",
120121
"email": "[email protected]",
121-
"timestamp": "2025-01-21 17:41:02"
122+
"timestamp": "2025-01-28 12:05:22"
122123
}
123124
}

‎ecm_definitions/(C) Best HPWH FS.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"market_entry_year": 2024,
66
"market_exit_year": null,
77
"min_eff_elec_flag": null,
8+
"ref_case_flag": null,
89
"climate_zone": "all",
910
"bldg_type": "all commercial",
1011
"structure_type": "all",
@@ -66,6 +67,6 @@
6667
"name": "Aven Satre:Meloy",
6768
"organization": "LBNL",
6869
"email": "[email protected]",
69-
"timestamp": "2025-01-21 17:41:02"
70+
"timestamp": "2025-01-28 12:05:22"
7071
}
7172
}

‎ecm_definitions/(C) Best HPWH TS.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"market_entry_year": 2024,
66
"market_exit_year": null,
77
"min_eff_elec_flag": null,
8+
"ref_case_flag": null,
89
"climate_zone": "all",
910
"bldg_type": "all commercial",
1011
"structure_type": "all",
@@ -63,6 +64,6 @@
6364
"name": "Aven Satre:Meloy",
6465
"organization": "LBNL",
6566
"email": "[email protected]",
66-
"timestamp": "2025-01-21 17:41:02"
67+
"timestamp": "2025-01-28 12:05:22"
6768
}
6869
}

‎ecm_definitions/(C) Best Lighting.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"market_entry_year": 2024,
66
"market_exit_year": null,
77
"min_eff_elec_flag": null,
8+
"ref_case_flag": null,
89
"climate_zone": "all",
910
"bldg_type": "all commercial",
1011
"structure_type": "all",
@@ -192,6 +193,6 @@
192193
"name": "Aven Satre:Meloy",
193194
"organization": "LBNL",
194195
"email": "[email protected]",
195-
"timestamp": "2025-01-21 17:41:02"
196+
"timestamp": "2025-01-28 12:05:22"
196197
}
197198
}

0 commit comments

Comments
 (0)