-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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.
- Loading branch information
1 parent
6cbd2b8
commit 9e22c4a
Showing
351 changed files
with
1,677 additions
and
757 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
"market_entry_year": 2024, | ||
"market_exit_year": null, | ||
"min_eff_elec_flag": null, | ||
"ref_case_flag": null, | ||
"climate_zone": "all", | ||
"bldg_type": "all commercial", | ||
"structure_type": "all", | ||
|
@@ -95,6 +96,6 @@ | |
"name": "Aven Satre:Meloy", | ||
"organization": "LBNL", | ||
"email": "[email protected]", | ||
"timestamp": "2025-01-21 17:41:02" | ||
"timestamp": "2025-01-28 12:05:22" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
"market_entry_year": 2024, | ||
"market_exit_year": null, | ||
"min_eff_elec_flag": null, | ||
"ref_case_flag": null, | ||
"climate_zone": "all", | ||
"bldg_type": "all commercial", | ||
"structure_type": "all", | ||
|
@@ -63,6 +64,6 @@ | |
"name": "Aven Satre:Meloy", | ||
"organization": "LBNL", | ||
"email": "[email protected]", | ||
"timestamp": "2025-01-21 17:41:02" | ||
"timestamp": "2025-01-28 12:05:22" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
"market_entry_year": 2024, | ||
"market_exit_year": null, | ||
"min_eff_elec_flag": null, | ||
"ref_case_flag": null, | ||
"climate_zone": "all", | ||
"bldg_type": [ | ||
"assembly", | ||
|
@@ -139,6 +140,6 @@ | |
"name": "Jared Langevin", | ||
"organization": "LBNL", | ||
"email": "[email protected]", | ||
"timestamp": "2025-01-21 17:41:02" | ||
"timestamp": "2025-01-28 12:05:22" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
"market_entry_year": 2024, | ||
"market_exit_year": null, | ||
"min_eff_elec_flag": null, | ||
"ref_case_flag": null, | ||
"climate_zone": "all", | ||
"bldg_type": [ | ||
"assembly", | ||
|
@@ -124,6 +125,6 @@ | |
"name": "Jared Langevin", | ||
"organization": "LBNL", | ||
"email": "[email protected]", | ||
"timestamp": "2025-01-21 17:41:02" | ||
"timestamp": "2025-01-28 12:05:22" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,7 @@ | |
"market_entry_year": 2040, | ||
"market_exit_year": null, | ||
"min_eff_elec_flag": null, | ||
"ref_case_flag": null, | ||
"climate_zone": "all", | ||
"bldg_type": [ | ||
"assembly", | ||
|
@@ -73,6 +74,6 @@ | |
"name": "Jared Langevin", | ||
"organization": "LBNL", | ||
"email": "[email protected]", | ||
"timestamp": "2025-01-21 17:41:02" | ||
"timestamp": "2025-01-28 12:05:22" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
"market_entry_year": 2040, | ||
"market_exit_year": null, | ||
"min_eff_elec_flag": null, | ||
"ref_case_flag": null, | ||
"climate_zone": "all", | ||
"bldg_type": [ | ||
"assembly", | ||
|
@@ -85,6 +86,6 @@ | |
"name": "Jared Langevin", | ||
"organization": "LBNL", | ||
"email": "[email protected]", | ||
"timestamp": "2025-01-21 17:41:02" | ||
"timestamp": "2025-01-28 12:05:22" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
"market_entry_year": 2040, | ||
"market_exit_year": null, | ||
"min_eff_elec_flag": null, | ||
"ref_case_flag": null, | ||
"climate_zone": "all", | ||
"bldg_type": [ | ||
"assembly", | ||
|
@@ -70,6 +71,6 @@ | |
"name": "Jared Langevin", | ||
"organization": "LBNL", | ||
"email": "[email protected]", | ||
"timestamp": "2025-01-21 17:41:02" | ||
"timestamp": "2025-01-28 12:05:22" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
"market_entry_year": 2035, | ||
"market_exit_year": null, | ||
"min_eff_elec_flag": null, | ||
"ref_case_flag": null, | ||
"climate_zone": "all", | ||
"bldg_type": [ | ||
"assembly", | ||
|
@@ -113,6 +114,6 @@ | |
"name": "Jared Langevin", | ||
"organization": "LBNL", | ||
"email": "[email protected]", | ||
"timestamp": "2025-01-21 17:41:02" | ||
"timestamp": "2025-01-28 12:05:22" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
"market_entry_year": 2024, | ||
"market_exit_year": null, | ||
"min_eff_elec_flag": null, | ||
"ref_case_flag": null, | ||
"climate_zone": "all", | ||
"bldg_type": "all commercial", | ||
"structure_type": "all", | ||
|
@@ -119,6 +120,6 @@ | |
"name": "Jared Langevin", | ||
"organization": "LBNL", | ||
"email": "[email protected]", | ||
"timestamp": "2025-01-21 17:41:02" | ||
"timestamp": "2025-01-28 12:05:22" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
"market_entry_year": 2024, | ||
"market_exit_year": null, | ||
"min_eff_elec_flag": null, | ||
"ref_case_flag": null, | ||
"climate_zone": "all", | ||
"bldg_type": "all commercial", | ||
"structure_type": "all", | ||
|
@@ -136,6 +137,6 @@ | |
"name": "Jared Langevin", | ||
"organization": "LBNL", | ||
"email": "[email protected]", | ||
"timestamp": "2025-01-21 17:41:02" | ||
"timestamp": "2025-01-28 12:05:22" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
"market_entry_year": 2024, | ||
"market_exit_year": null, | ||
"min_eff_elec_flag": null, | ||
"ref_case_flag": null, | ||
"climate_zone": "all", | ||
"bldg_type": "all commercial", | ||
"structure_type": "all", | ||
|
@@ -117,6 +118,6 @@ | |
"name": "Jared Langevin", | ||
"organization": "LBNL", | ||
"email": "[email protected]", | ||
"timestamp": "2025-01-21 17:41:02" | ||
"timestamp": "2025-01-28 12:05:22" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
"market_entry_year": 2024, | ||
"market_exit_year": null, | ||
"min_eff_elec_flag": null, | ||
"ref_case_flag": null, | ||
"climate_zone": "all", | ||
"bldg_type": "all commercial", | ||
"structure_type": "all", | ||
|
@@ -143,6 +144,6 @@ | |
"name": "Jared Langevin", | ||
"organization": "LBNL", | ||
"email": "[email protected]", | ||
"timestamp": "2025-01-21 17:41:02" | ||
"timestamp": "2025-01-28 12:05:22" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
"market_entry_year": 2024, | ||
"market_exit_year": null, | ||
"min_eff_elec_flag": null, | ||
"ref_case_flag": null, | ||
"climate_zone": "all", | ||
"bldg_type": "all commercial", | ||
"structure_type": "all", | ||
|
@@ -120,6 +121,6 @@ | |
"name": "Jared Langevin", | ||
"organization": "LBNL", | ||
"email": "[email protected]", | ||
"timestamp": "2025-01-21 17:41:02" | ||
"timestamp": "2025-01-28 12:05:22" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
"market_entry_year": 2024, | ||
"market_exit_year": null, | ||
"min_eff_elec_flag": null, | ||
"ref_case_flag": null, | ||
"climate_zone": "all", | ||
"bldg_type": "all commercial", | ||
"structure_type": "all", | ||
|
@@ -118,6 +119,6 @@ | |
"name": "Jared Langevin", | ||
"organization": "LBNL", | ||
"email": "[email protected]", | ||
"timestamp": "2025-01-21 17:41:02" | ||
"timestamp": "2025-01-28 12:05:22" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
"market_entry_year": 2024, | ||
"market_exit_year": null, | ||
"min_eff_elec_flag": null, | ||
"ref_case_flag": null, | ||
"climate_zone": "all", | ||
"bldg_type": "all commercial", | ||
"structure_type": "all", | ||
|
@@ -119,6 +120,6 @@ | |
"name": "Jared Langevin", | ||
"organization": "LBNL", | ||
"email": "[email protected]", | ||
"timestamp": "2025-01-21 17:41:02" | ||
"timestamp": "2025-01-28 12:05:22" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
"market_entry_year": 2024, | ||
"market_exit_year": null, | ||
"min_eff_elec_flag": null, | ||
"ref_case_flag": null, | ||
"climate_zone": "all", | ||
"bldg_type": "all commercial", | ||
"structure_type": "all", | ||
|
@@ -134,6 +135,6 @@ | |
"name": "Jared Langevin", | ||
"organization": "LBNL", | ||
"email": "[email protected]", | ||
"timestamp": "2025-01-21 17:41:02" | ||
"timestamp": "2025-01-28 12:05:22" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
"market_entry_year": 2024, | ||
"market_exit_year": null, | ||
"min_eff_elec_flag": null, | ||
"ref_case_flag": null, | ||
"climate_zone": "all", | ||
"bldg_type": "all commercial", | ||
"structure_type": "all", | ||
|
@@ -117,6 +118,6 @@ | |
"name": "Jared Langevin", | ||
"organization": "LBNL", | ||
"email": "[email protected]", | ||
"timestamp": "2025-01-21 17:41:02" | ||
"timestamp": "2025-01-28 12:05:22" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
"market_entry_year": 2024, | ||
"market_exit_year": null, | ||
"min_eff_elec_flag": null, | ||
"ref_case_flag": null, | ||
"climate_zone": "all", | ||
"bldg_type": "all commercial", | ||
"structure_type": "all", | ||
|
@@ -141,6 +142,6 @@ | |
"name": "Jared Langevin", | ||
"organization": "LBNL", | ||
"email": "[email protected]", | ||
"timestamp": "2025-01-21 17:41:02" | ||
"timestamp": "2025-01-28 12:05:22" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
"market_entry_year": 2024, | ||
"market_exit_year": null, | ||
"min_eff_elec_flag": null, | ||
"ref_case_flag": null, | ||
"climate_zone": "all", | ||
"bldg_type": "all commercial", | ||
"structure_type": "all", | ||
|
@@ -120,6 +121,6 @@ | |
"name": "Jared Langevin", | ||
"organization": "LBNL", | ||
"email": "[email protected]", | ||
"timestamp": "2025-01-21 17:41:02" | ||
"timestamp": "2025-01-28 12:05:22" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
"market_entry_year": 2024, | ||
"market_exit_year": null, | ||
"min_eff_elec_flag": null, | ||
"ref_case_flag": null, | ||
"climate_zone": "all", | ||
"bldg_type": "all commercial", | ||
"structure_type": "all", | ||
|
@@ -118,6 +119,6 @@ | |
"name": "Jared Langevin", | ||
"organization": "LBNL", | ||
"email": "[email protected]", | ||
"timestamp": "2025-01-21 17:41:02" | ||
"timestamp": "2025-01-28 12:05:22" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
"market_entry_year": 2024, | ||
"market_exit_year": null, | ||
"min_eff_elec_flag": null, | ||
"ref_case_flag": null, | ||
"climate_zone": "all", | ||
"bldg_type": "all commercial", | ||
"structure_type": "all", | ||
|
@@ -66,6 +67,6 @@ | |
"name": "Aven Satre:Meloy", | ||
"organization": "LBNL", | ||
"email": "[email protected]", | ||
"timestamp": "2025-01-21 17:41:02" | ||
"timestamp": "2025-01-28 12:05:22" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
"market_entry_year": 2024, | ||
"market_exit_year": null, | ||
"min_eff_elec_flag": null, | ||
"ref_case_flag": null, | ||
"climate_zone": "all", | ||
"bldg_type": "all commercial", | ||
"structure_type": "all", | ||
|
@@ -63,6 +64,6 @@ | |
"name": "Aven Satre:Meloy", | ||
"organization": "LBNL", | ||
"email": "[email protected]", | ||
"timestamp": "2025-01-21 17:41:02" | ||
"timestamp": "2025-01-28 12:05:22" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
"market_entry_year": 2024, | ||
"market_exit_year": null, | ||
"min_eff_elec_flag": null, | ||
"ref_case_flag": null, | ||
"climate_zone": "all", | ||
"bldg_type": "all commercial", | ||
"structure_type": "all", | ||
|
@@ -192,6 +193,6 @@ | |
"name": "Aven Satre:Meloy", | ||
"organization": "LBNL", | ||
"email": "[email protected]", | ||
"timestamp": "2025-01-21 17:41:02" | ||
"timestamp": "2025-01-28 12:05:22" | ||
} | ||
} |
Oops, something went wrong.