Skip to content

Commit

Permalink
Extract EIA923 energy storage table (#3516)
Browse files Browse the repository at this point in the history
* Map EIA923 energy storage table. The energy storage table was already mapped in the filemap and skiprows csvs but it was incorrect so I fixed that as well.

* Rename net_generation_megawatthours in the generation_fuel table and net_generation_mwh in the energy_storage table to net_generation_mwh_total so as not to interfere with the aggregation of the monthly net_generation_mwh values that happens in the transform.

* Rename EIA923 combined_heat_power columns to associated_combined_heat_power to match EIA860. And add an alembic migration.

* Move total_ to the front of the net_generation_mwh_total column in generation_fuel and energy_storage tables and update alembic migration
  • Loading branch information
aesharpe authored Mar 28, 2024
1 parent 796fe29 commit 6647e96
Show file tree
Hide file tree
Showing 10 changed files with 448 additions and 14 deletions.

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/pudl/extract/eia923.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ def get_dtypes(page, **partition):
# TODO (bendnorman): Add this information to the metadata
eia_raw_table_names = (
"raw_eia923__boiler_fuel",
"raw_eia923__energy_storage",
"raw_eia923__fuel_receipts_costs",
"raw_eia923__generation_fuel",
"raw_eia923__generator",
Expand Down
2 changes: 1 addition & 1 deletion src/pudl/package_data/eia923/column_maps/boiler_fuel.csv
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
year_index,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023
plant_id_eia,plant_id,plant_id,plant_id,plant_id,plant_id,plant_id,plant_id,plant_id,plant_id,plant_id,plant_id,plant_id,plant_id,plant_id,plant_id,plant_id
combined_heat_power,combined_heat_power_plant,combined_heat_power_plant,combined_heat_power_plant,combined_heat_power_plant,combined_heat_and_power_plant,combined_heat_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant
associated_combined_heat_power,combined_heat_power_plant,combined_heat_power_plant,combined_heat_power_plant,combined_heat_power_plant,combined_heat_and_power_plant,combined_heat_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant
plant_name_eia,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name
operator_name,operator_name,operator_name,operator_name,operator_name,operator_name,operator_name,operator_name,operator_name,operator_name,operator_name,operator_name,operator_name,operator_name,operator_name,operator_name,operator_name
operator_id,operator_id,operator_id,operator_id,operator_id,operator_id,operator_id,operator_id,operator_id,operator_id,operator_id,operator_id,operator_id,operator_id,operator_id,operator_id,operator_id
Expand Down
71 changes: 71 additions & 0 deletions src/pudl/package_data/eia923/column_maps/energy_storage.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
year_index,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023
plant_id_eia,plant_id,plant_id,plant_id,plant_id,plant_id,plant_id,plant_id,plant_id,plant_id,plant_id
associated_combined_heat_power,combined_heat_and_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant,combined_heat_and_power_plant
plant_name_eia,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name
operator_name,operator_name,operator_name,operator_name,operator_name,operator_name,operator_name,operator_name,operator_name,operator_name,operator_name
operator_id,operator_id,operator_id,operator_id,operator_id,operator_id,operator_id,operator_id,operator_id,operator_id,operator_id
plant_state,plant_state,plant_state,plant_state,plant_state,plant_state,plant_state,plant_state,plant_state,plant_state,plant_state
census_region,census_region,census_region,census_region,census_region,census_region,census_region,census_region,census_region,census_region,census_region
nerc_region,nerc_region,nerc_region,nerc_region,nerc_region,nerc_region,nerc_region,nerc_region,nerc_region,nerc_region,nerc_region
naics_code,naics_code,naics_code,naics_code,naics_code,naics_code,naics_code,naics_code,naics_code,naics_code,naics_code
sector_id_eia,eia_sector_number,eia_sector_number,eia_sector_number,eia_sector_number,eia_sector_number,eia_sector_number,eia_sector_number,eia_sector_number,eia_sector_number,eia_sector_number
sector_name_eia,sector_name,sector_name,sector_name,sector_name,sector_name,sector_name,sector_name,sector_name,sector_name,sector_name
prime_mover_code,reported_prime_mover,reported_prime_mover,reported_prime_mover,reported_prime_mover,reported_prime_mover,reported_prime_mover,reported_prime_mover,reported_prime_mover,reported_prime_mover,reported_prime_mover
energy_source_code,reported_fuel_type_code,reported_fuel_type_code,reported_fuel_type_code,reported_fuel_type_code,reported_fuel_type_code,reported_fuel_type_code,reported_fuel_type_code,reported_fuel_type_code,reported_fuel_type_code,reported_fuel_type_code
fuel_type_code_aer,aer_fuel_type_code,aer_fuel_type_code,aer_fuel_type_code,aer_fuel_type_code,aer_fuel_type_code,aer_fuel_type_code,aer_fuel_type_code,aer_fuel_type_code,aer_fuel_type_code,aer_fuel_type_code
balancing_authority_code_eia,,,,,balancing_authority_code,balancing_authority_code,balancing_authority_code,balancing_authority_code,balancing_authority_code,balancing_authority_code
reporting_frequency_code,,,,,respondent_frequency,respondent_frequency,respondent_frequency,respondent_frequency,respondent_frequency,
fuel_unit,physical_unit_label,physical_unit_label,physical_unit_label,physical_unit_label,physical_unit_label,physical_unit_label,physical_unit_label,physical_unit_label,physical_unit_label,physical_unit_label
fuel_consumed_units_january,quantity_january,quantity_january,quantity_january,quantity_january,quantity_january,quantity_january,quantity_january,quantity_january,quantity_january,quantity_january
fuel_consumed_units_february,quantity_february,quantity_february,quantity_february,quantity_february,quantity_february,quantity_february,quantity_february,quantity_february,quantity_february,quantity_february
fuel_consumed_units_march,quantity_march,quantity_march,quantity_march,quantity_march,quantity_march,quantity_march,quantity_march,quantity_march,quantity_march,quantity_march
fuel_consumed_units_april,quantity_april,quantity_april,quantity_april,quantity_april,quantity_april,quantity_april,quantity_april,quantity_april,quantity_april,quantity_april
fuel_consumed_units_may,quantity_may,quantity_may,quantity_may,quantity_may,quantity_may,quantity_may,quantity_may,quantity_may,quantity_may,quantity_may
fuel_consumed_units_june,quantity_june,quantity_june,quantity_june,quantity_june,quantity_june,quantity_june,quantity_june,quantity_june,quantity_june,quantity_june
fuel_consumed_units_july,quantity_july,quantity_july,quantity_july,quantity_july,quantity_july,quantity_july,quantity_july,quantity_july,quantity_july,quantity_july
fuel_consumed_units_august,quantity_august,quantity_august,quantity_august,quantity_august,quantity_august,quantity_august,quantity_august,quantity_august,quantity_august,quantity_august
fuel_consumed_units_september,quantity_september,quantity_september,quantity_september,quantity_september,quantity_september,quantity_september,quantity_september,quantity_september,quantity_september,quantity_september
fuel_consumed_units_october,quantity_october,quantity_october,quantity_october,quantity_october,quantity_october,quantity_october,quantity_october,quantity_october,quantity_october,quantity_october
fuel_consumed_units_november,quantity_november,quantity_november,quantity_november,quantity_november,quantity_november,quantity_november,quantity_november,quantity_november,quantity_november,quantity_november
fuel_consumed_units_december,quantity_december,quantity_december,quantity_december,quantity_december,quantity_december,quantity_december,quantity_december,quantity_december,quantity_december,quantity_december
fuel_consumed_for_electricity_units_january,elec_quantity_january,elec_quantity_january,elec_quantity_january,elec_quantity_january,elec_quantity_january,elec_quantity_january,elec_quantity_january,elec_quantity_january,elec_quantity_january,elec_quantity_january
fuel_consumed_for_electricity_units_february,elec_quantity_february,elec_quantity_february,elec_quantity_february,elec_quantity_february,elec_quantity_february,elec_quantity_february,elec_quantity_february,elec_quantity_february,elec_quantity_february,elec_quantity_february
fuel_consumed_for_electricity_units_march,elec_quantity_march,elec_quantity_march,elec_quantity_march,elec_quantity_march,elec_quantity_march,elec_quantity_march,elec_quantity_march,elec_quantity_march,elec_quantity_march,elec_quantity_march
fuel_consumed_for_electricity_units_april,elec_quantity_april,elec_quantity_april,elec_quantity_april,elec_quantity_april,elec_quantity_april,elec_quantity_april,elec_quantity_april,elec_quantity_april,elec_quantity_april,elec_quantity_april
fuel_consumed_for_electricity_units_may,elec_quantity_may,elec_quantity_may,elec_quantity_may,elec_quantity_may,elec_quantity_may,elec_quantity_may,elec_quantity_may,elec_quantity_may,elec_quantity_may,elec_quantity_may
fuel_consumed_for_electricity_units_june,elec_quantity_june,elec_quantity_june,elec_quantity_june,elec_quantity_june,elec_quantity_june,elec_quantity_june,elec_quantity_june,elec_quantity_june,elec_quantity_june,elec_quantity_june
fuel_consumed_for_electricity_units_july,elec_quantity_july,elec_quantity_july,elec_quantity_july,elec_quantity_july,elec_quantity_july,elec_quantity_july,elec_quantity_july,elec_quantity_july,elec_quantity_july,elec_quantity_july
fuel_consumed_for_electricity_units_august,elec_quantity_august,elec_quantity_august,elec_quantity_august,elec_quantity_august,elec_quantity_august,elec_quantity_august,elec_quantity_august,elec_quantity_august,elec_quantity_august,elec_quantity_august
fuel_consumed_for_electricity_units_september,elec_quantity_september,elec_quantity_september,elec_quantity_september,elec_quantity_september,elec_quantity_september,elec_quantity_september,elec_quantity_september,elec_quantity_september,elec_quantity_september,elec_quantity_september
fuel_consumed_for_electricity_units_october,elec_quantity_october,elec_quantity_october,elec_quantity_october,elec_quantity_october,elec_quantity_october,elec_quantity_october,elec_quantity_october,elec_quantity_october,elec_quantity_october,elec_quantity_october
fuel_consumed_for_electricity_units_november,elec_quantity_november,elec_quantity_november,elec_quantity_november,elec_quantity_november,elec_quantity_november,elec_quantity_november,elec_quantity_november,elec_quantity_november,elec_quantity_november,elec_quantity_november
fuel_consumed_for_electricity_units_december,elec_quantity_december,elec_quantity_december,elec_quantity_december,elec_quantity_december,elec_quantity_december,elec_quantity_december,elec_quantity_december,elec_quantity_december,elec_quantity_december,elec_quantity_december
gross_generation_mwh_january,grossgen_january,grossgen_january,grossgen_january,grossgen_january,grossgen_january,grossgen_january,grossgen_january,grossgen_january,grossgen_january,grossgen_january
gross_generation_mwh_february,grossgen_february,grossgen_february,grossgen_february,grossgen_february,grossgen_february,grossgen_february,grossgen_february,grossgen_february,grossgen_february,grossgen_february
gross_generation_mwh_march,grossgen_march,grossgen_march,grossgen_march,grossgen_march,grossgen_march,grossgen_march,grossgen_march,grossgen_march,grossgen_march,grossgen_march
gross_generation_mwh_april,grossgen_april,grossgen_april,grossgen_april,grossgen_april,grossgen_april,grossgen_april,grossgen_april,grossgen_april,grossgen_april,grossgen_april
gross_generation_mwh_may,grossgen_may,grossgen_may,grossgen_may,grossgen_may,grossgen_may,grossgen_may,grossgen_may,grossgen_may,grossgen_may,grossgen_may
gross_generation_mwh_june,grossgen_june,grossgen_june,grossgen_june,grossgen_june,grossgen_june,grossgen_june,grossgen_june,grossgen_june,grossgen_june,grossgen_june
gross_generation_mwh_july,grossgen_july,grossgen_july,grossgen_july,grossgen_july,grossgen_july,grossgen_july,grossgen_july,grossgen_july,grossgen_july,grossgen_july
gross_generation_mwh_august,grossgen_august,grossgen_august,grossgen_august,grossgen_august,grossgen_august,grossgen_august,grossgen_august,grossgen_august,grossgen_august,grossgen_august
gross_generation_mwh_september,grossgen_september,grossgen_september,grossgen_september,grossgen_september,grossgen_september,grossgen_september,grossgen_september,grossgen_september,grossgen_september,grossgen_september
gross_generation_mwh_october,grossgen_october,grossgen_october,grossgen_october,grossgen_october,grossgen_october,grossgen_october,grossgen_october,grossgen_october,grossgen_october,grossgen_october
gross_generation_mwh_november,grossgen_november,grossgen_november,grossgen_november,grossgen_november,grossgen_november,grossgen_november,grossgen_november,grossgen_november,grossgen_november,grossgen_november
gross_generation_mwh_december,grossgen_december,grossgen_december,grossgen_december,grossgen_december,grossgen_december,grossgen_december,grossgen_december,grossgen_december,grossgen_december,grossgen_december
net_generation_mwh_january,netgen_january,netgen_january,netgen_january,netgen_january,netgen_january,netgen_january,netgen_january,netgen_january,netgen_january,netgen_january
net_generation_mwh_february,netgen_february,netgen_february,netgen_february,netgen_february,netgen_february,netgen_february,netgen_february,netgen_february,netgen_february,netgen_february
net_generation_mwh_march,netgen_march,netgen_march,netgen_march,netgen_march,netgen_march,netgen_march,netgen_march,netgen_march,netgen_march,netgen_march
net_generation_mwh_april,netgen_april,netgen_april,netgen_april,netgen_april,netgen_april,netgen_april,netgen_april,netgen_april,netgen_april,netgen_april
net_generation_mwh_may,netgen_may,netgen_may,netgen_may,netgen_may,netgen_may,netgen_may,netgen_may,netgen_may,netgen_may,netgen_may
net_generation_mwh_june,netgen_june,netgen_june,netgen_june,netgen_june,netgen_june,netgen_june,netgen_june,netgen_june,netgen_june,netgen_june
net_generation_mwh_july,netgen_july,netgen_july,netgen_july,netgen_july,netgen_july,netgen_july,netgen_july,netgen_july,netgen_july,netgen_july
net_generation_mwh_august,netgen_august,netgen_august,netgen_august,netgen_august,netgen_august,netgen_august,netgen_august,netgen_august,netgen_august,netgen_august
net_generation_mwh_september,netgen_september,netgen_september,netgen_september,netgen_september,netgen_september,netgen_september,netgen_september,netgen_september,netgen_september,netgen_september
net_generation_mwh_october,netgen_october,netgen_october,netgen_october,netgen_october,netgen_october,netgen_october,netgen_october,netgen_october,netgen_october,netgen_october
net_generation_mwh_november,netgen_november,netgen_november,netgen_november,netgen_november,netgen_november,netgen_november,netgen_november,netgen_november,netgen_november,netgen_november
net_generation_mwh_december,netgen_december,netgen_december,netgen_december,netgen_december,netgen_december,netgen_december,netgen_december,netgen_december,netgen_december,netgen_december
total_fuel_consumption_quantity,total_fuel_consumption_quantity,total_fuel_consumption_quantity,total_fuel_consumption_quantity,total_fuel_consumption_quantity,total_fuel_consumption_quantity,total_fuel_consumption_quantity,total_fuel_consumption_quantity,total_fuel_consumption_quantity,total_fuel_consumption_quantity,total_fuel_consumption_quantity
electric_fuel_consumption_quantity,electric_fuel_consumption_quantity,electric_fuel_consumption_quantity,electric_fuel_consumption_quantity,electric_fuel_consumption_quantity,electric_fuel_consumption_quantity,electric_fuel_consumption_quantity,electric_fuel_consumption_quantity,electric_fuel_consumption_quantity,electric_fuel_consumption_quantity,electric_fuel_consumption_quantity
gross_generation_mwh,gross_generation_megawatthours,gross_generation_megawatthours,gross_generation_megawatthours,gross_generation_megawatthours,gross_generation_megawatthours,gross_generation_megawatthours,gross_generation_megawatthours,gross_generation_megawatthours,gross_generation_megawatthours,gross_generation_megawatthours
total_net_generation_mwh,net_generation_megawatthours,net_generation_megawatthours,net_generation_megawatthours,net_generation_megawatthours,net_generation_megawatthours,net_generation_megawatthours,net_generation_megawatthours,net_generation_megawatthours,net_generation_megawatthours,net_generation_megawatthours
report_year,year,year,year,year,year,year,year,year,year,year
Loading

0 comments on commit 6647e96

Please sign in to comment.