v2.1 - Addesses Issue#260#318
Conversation
still need stewicombo_file for each. NETL-RIC#275
See solution provided by Ben, 6b859fa
- updated egrid_facilities.py to account for FuelCategory column name in new stewi data - updated eia_trans_dist_grid_loss.py to account for new link format for 2023 data
Updated parameter type for 'year' to accept both string and integer. Added type check to convert 'year' to string if passed as an integer. Adjusted DataFrame selection to use double brackets for consistency.
Updates for ELCI2023 + other minor bug fixes
- added ng_model_year parameter to the modelconfig files
- added new function to generate the ng lci based on the ng_model_year parameter
- added NG_MODEL_YEARS to globals.py
- added the ng_model_year to the config files
- minor fix in eia_trans_dist_grid_loss.py
- important note: modified generate_upstream_ng to handle NaN values.
See comments in the code.
- Updated the 2020 ng model to use the region basis - Implemented additional changes to map eia plants to regions - Updated the code to use basin mapping for 2016 and region basis for 2020 ng model
Natural Gas Upstream update - Addresses issue NETL-RIC#260
decisions on where the stewicombo file will live is in discussion; stewi files should be available on EPA data commons
HOTFIX - t&d download links
| TRI: 2023 | ||
| NEI: 2020 | ||
| RCRAInfo: 2023 | ||
| stewicombo_file: 'ELCI_2020_v1.1.4' |
There was a problem hiding this comment.
We haven't implemented ELCI_2024 yet; still focused on getting 2023 completed. Thank you for pointing out that we need to update the stewicombo file here, likely to match the one used in 2023.
|
Note that this PR also includes updates to EIA's state-level electricity profiles for T&D loss calculations. |
| """ | ||
| # This data frame has about 4k source flow names and contexts associated | ||
| # with NETL unit process models (e.g., petro, nuclear, coal). | ||
| flow_mapping = pd.read_csv(flow_mapping_path, encoding='ISO-8859-1') |
There was a problem hiding this comment.
@frankhanna94: I'm adding a reminder that the new workflow is to update eLCI.csv found in fedelemflowlist package (see FLCAC-admin/fedelemflowlist#217), so this will need updated/fixed to align with this update.
dt-woods
left a comment
dt-woods
left a comment
There was a problem hiding this comment.
All changes appear good to go. The only note I make is for a future update to correct the external eLCI.csv with the newly updated eLCI.csv found on fedelemflowlist repo.
|
Adding fixes to setup.py to address #316. |
4 participants
High-level summary of additions in this pull request