diff --git a/migrations/versions/5d043449e9e1_change_923_column_name_combined_heat_.py b/migrations/versions/5d043449e9e1_change_923_column_name_combined_heat_.py new file mode 100644 index 0000000000..d58257e2cc --- /dev/null +++ b/migrations/versions/5d043449e9e1_change_923_column_name_combined_heat_.py @@ -0,0 +1,362 @@ +"""change 923 column name combined_heat_power to associated_combined_heat_power to match 860. Also move total_ to the front of the column from net_generation_mwh_total in the generation_fuel table. + +Revision ID: 5d043449e9e1 +Revises: 41120381bfda +Create Date: 2024-03-28 14:45:39.801728 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '5d043449e9e1' +down_revision = '41120381bfda' +branch_labels = None +depends_on = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('core_ferc1__yearly_balance_sheet_assets_sched110', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_balance_sheet_liabilities_sched110', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_cash_flows_sched120', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_depreciation_by_function_sched219', schema=None) as batch_op: + batch_op.alter_column('depreciation_type', + existing_type=sa.TEXT(), + nullable=False) + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_depreciation_changes_sched219', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_depreciation_summary_sched336', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_energy_dispositions_sched401', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_energy_sources_sched401', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_income_statements_sched114', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_operating_expenses_sched320', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_operating_revenues_sched300', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_plant_in_service_sched204', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_retained_earnings_sched118', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_utility_plant_summary_sched200', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_balance_sheet_assets_sched110', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_balance_sheet_liabilities_sched110', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_cash_flows_sched120', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_depreciation_by_function_sched219', schema=None) as batch_op: + batch_op.alter_column('depreciation_type', + existing_type=sa.TEXT(), + nullable=False) + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_depreciation_changes_sched219', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_energy_dispositions_sched401', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_energy_sources_sched401', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_income_statements_sched114', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_operating_expenses_sched320', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_operating_revenues_sched300', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_plant_in_service_sched204', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_retained_earnings_sched118', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_utility_plant_summary_sched200', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.VARCHAR(length=16), + type_=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + existing_nullable=True) + + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('out_ferc1__yearly_utility_plant_summary_sched200', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_retained_earnings_sched118', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_plant_in_service_sched204', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_operating_revenues_sched300', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_operating_expenses_sched320', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_income_statements_sched114', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_energy_sources_sched401', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_energy_dispositions_sched401', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_depreciation_changes_sched219', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_depreciation_by_function_sched219', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + batch_op.alter_column('depreciation_type', + existing_type=sa.TEXT(), + nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_cash_flows_sched120', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_balance_sheet_liabilities_sched110', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + with op.batch_alter_table('out_ferc1__yearly_balance_sheet_assets_sched110', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_utility_plant_summary_sched200', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_retained_earnings_sched118', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_plant_in_service_sched204', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_operating_revenues_sched300', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_operating_expenses_sched320', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_income_statements_sched114', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_energy_sources_sched401', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_energy_dispositions_sched401', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_depreciation_summary_sched336', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_depreciation_changes_sched219', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_depreciation_by_function_sched219', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + batch_op.alter_column('depreciation_type', + existing_type=sa.TEXT(), + nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_cash_flows_sched120', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_balance_sheet_liabilities_sched110', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + with op.batch_alter_table('core_ferc1__yearly_balance_sheet_assets_sched110', schema=None) as batch_op: + batch_op.alter_column('row_type_xbrl', + existing_type=sa.Enum('calculated_value', 'reported_value', 'correction', 'subdimension_correction'), + type_=sa.VARCHAR(length=16), + existing_nullable=True) + + # ### end Alembic commands ### diff --git a/src/pudl/extract/eia923.py b/src/pudl/extract/eia923.py index 3b4d1f0df4..b060d9d943 100644 --- a/src/pudl/extract/eia923.py +++ b/src/pudl/extract/eia923.py @@ -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", diff --git a/src/pudl/package_data/eia923/column_maps/boiler_fuel.csv b/src/pudl/package_data/eia923/column_maps/boiler_fuel.csv index 6db1f22b43..2062342d8e 100644 --- a/src/pudl/package_data/eia923/column_maps/boiler_fuel.csv +++ b/src/pudl/package_data/eia923/column_maps/boiler_fuel.csv @@ -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 diff --git a/src/pudl/package_data/eia923/column_maps/energy_storage.csv b/src/pudl/package_data/eia923/column_maps/energy_storage.csv new file mode 100644 index 0000000000..0863a0c19c --- /dev/null +++ b/src/pudl/package_data/eia923/column_maps/energy_storage.csv @@ -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 diff --git a/src/pudl/package_data/eia923/column_maps/generation_fuel.csv b/src/pudl/package_data/eia923/column_maps/generation_fuel.csv index 8b8703b825..b57ac03ab5 100644 --- a/src/pudl/package_data/eia923/column_maps/generation_fuel.csv +++ b/src/pudl/package_data/eia923/column_maps/generation_fuel.csv @@ -1,6 +1,6 @@ year_index,2001,2002,2003,2004,2005,2006,2007,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,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_power_plant,combined_heat_power_plant,combined_heat_power_plant,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_power_plant,combined_heat_power_plant,combined_heat_power_plant,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 nuclear_unit_id,nuclear_unit_i_d,nuclear_unit_i_d,nuclear_unit_i_d,nuclear_unit_i_d,nuclear_unit_i_d,nuclear_unit_i_d,nuclear_unit_i_d,nuclear_unit_i_d,nuclear_unit_i_d,nuclear_unit_i_d,nuclear_unit_id,nuclear_unit_id,nuclear_unit_id,nuclear_unit_id,nuclear_unit_id,nuclear_unit_id,nuclear_unit_id,nuclear_unit_id,nuclear_unit_id,nuclear_unit_id,nuclear_unit_id,nuclear_unit_id,nuclear_unit_id 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,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_name,operator_name,operator_name,operator_name,operator_name,operator_name,operator_name @@ -93,6 +93,6 @@ total_fuel_consumption_quantity,total_fuel_consumption_quantity,total_fuel_consu 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,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,electric_fuel_consumption_quantity,electric_fuel_consumption_quantity total_fuel_consumption_mmbtu,total_fuel_consumption_mmbtus,total_fuel_consumption_mmbtus,total_fuel_consumption_mmbtus,total_fuel_consumption_mmbtus,total_fuel_consumption_mmbtus,total_fuel_consumption_mmbtus,total_fuel_consumption_mmbtus,total_fuel_consumption_mmbtus,total_fuel_consumption_mmbtus,total_fuel_consumption_mmbtus,total_fuel_consumption_mmbtu,total_fuel_consumption_mmbtu,total_fuel_consumption_mmbtu,total_fuel_consumption_mmbtu,total_fuel_consumption_mmbtu,total_fuel_consumption_mmbtu,total_fuel_consumption_mmbtu,total_fuel_consumption_mmbtu,total_fuel_consumption_mmbtu,total_fuel_consumption_mmbtu,total_fuel_consumption_mmbtu,total_fuel_consumption_mmbtu,total_fuel_consumption_mmbtu elec_fuel_consumption_mmbtu,elec_fuel_consumption_mmbtus,elec_fuel_consumption_mmbtus,elec_fuel_consumption_mmbtus,elec_fuel_consumption_mmbtus,elec_fuel_consumption_mmbtus,elec_fuel_consumption_mmbtus,elec_fuel_consumption_mmbtus,elec_fuel_consumption_mmbtus,elec_fuel_consumption_mmbtus,elec_fuel_consumption_mmbtus,elec_fuel_consumption_mmbtu,elec_fuel_consumption_mmbtu,elec_fuel_consumption_mmbtu,elec_fuel_consumption_mmbtu,elec_fuel_consumption_mmbtu,elec_fuel_consumption_mmbtu,elec_fuel_consumption_mmbtu,elec_fuel_consumption_mmbtu,elec_fuel_consumption_mmbtu,elec_fuel_consumption_mmbtu,elec_fuel_consumption_mmbtu,elec_fuel_consumption_mmbtu,elec_fuel_consumption_mmbtu -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,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,net_generation_megawatthours,net_generation_megawatthours,net_generation_megawatthours,net_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,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,net_generation_megawatthours,net_generation_megawatthours,net_generation_megawatthours report_year,year,year,year,year,year,year,year,year,year,year,year,year,year,year,year,year,year,year,year,year,year,year,year early_release,,,,,,,,,,,,,,,,,,,,,,, diff --git a/src/pudl/package_data/eia923/column_maps/generator.csv b/src/pudl/package_data/eia923/column_maps/generator.csv index 922a0f18d7..0620fe566d 100644 --- a/src/pudl/package_data/eia923/column_maps/generator.csv +++ b/src/pudl/package_data/eia923/column_maps/generator.csv @@ -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 diff --git a/src/pudl/package_data/eia923/column_maps/plant_frame.csv b/src/pudl/package_data/eia923/column_maps/plant_frame.csv index 30b04c412e..9c0bc3528c 100644 --- a/src/pudl/package_data/eia923/column_maps/plant_frame.csv +++ b/src/pudl/package_data/eia923/column_maps/plant_frame.csv @@ -6,7 +6,7 @@ plant_state,plant_state,plant_state,plant_state,plant_state,plant_state,plant_st eia_sector,sector,sector_number,sector,sector_number,sector_number,sector_number,sector_number,sector_number,sector_number,sector_number,sector_number,sector_number,sector_number naics_code,north_american_industiral_classification_system_naics_code,naics_code,north_american_industrial_classification_system_naics_code,naics_code,naics_code,naics_code,naics_code,naics_code,naics_code,naics_code,naics_code,naics_code,naics_code 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 -combined_heat_power,combined_heat_and_power_status_y_chp_n_non_chp,combined_heat_and_power_status,combined_heat_and_power_status_y_chp_n_non_chp,combined_heat_and_power_status,combined_heat_and_power_status,combined_heat_and_power_status,combined_heat_and_power_status,combined_heat_and_power_status,combined_heat_and_power_status,combined_heat_and_power_status,combined_heat_and_power_status,combined_heat_and_power_status,combined_heat_and_power_status +associated_combined_heat_power,combined_heat_and_power_status_y_chp_n_non_chp,combined_heat_and_power_status,combined_heat_and_power_status_y_chp_n_non_chp,combined_heat_and_power_status,combined_heat_and_power_status,combined_heat_and_power_status,combined_heat_and_power_status,combined_heat_and_power_status,combined_heat_and_power_status,combined_heat_and_power_status,combined_heat_and_power_status,combined_heat_and_power_status,combined_heat_and_power_status reporting_frequency_code,reporting_frequency_annual_or_monthly,reporting_frequency,reporting_frequency_annual_or_monthly,reporting_frequency,reporting_frequency,reporting_frequency,reporting_frequency,reporting_frequency,reporting_frequency,respondent_frequency,respondent_frequency,respondent_frequency,respondent_frequency nameplate_capacity_mw,nameplate_capacity_mw,,,,,,,,,,,, early_release,,,,,,,,,,,,, diff --git a/src/pudl/package_data/eia923/file_map.csv b/src/pudl/package_data/eia923/file_map.csv index 90c8330923..cdf4fb588f 100644 --- a/src/pudl/package_data/eia923/file_map.csv +++ b/src/pudl/package_data/eia923/file_map.csv @@ -1,7 +1,7 @@ page,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023 boiler_fuel,-1,-1,-1,-1,-1,-1,-1,eia923December2008.xls,EIA923 SCHEDULES 2_3_4_5 M Final 2009 REVISED 05252011.XLS,EIA923 SCHEDULES 2_3_4_5 Final 2010.xls,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Final.xlsx,EIA923_Schedules_2_3_4_5_M_11_2023_17JAN2024.xlsx coal_stocks,-1,f906920y2002.xls,f906920_2003.xls,f906920_2004.xls,f906920_2005.xls,f906920_2006.xls,f906920_2007.xls,eia923December2008.xls,EIA923 SCHEDULES 2_3_4_5 M Final 2009 REVISED 05252011.XLS,EIA923 SCHEDULES 2_3_4_5 Final 2010.xls,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,-1,-1,-1 -energy_storage,-1,-1,-1,-1,-1,-1,-1,eia923December2008.xls,EIA923 SCHEDULES 2_3_4_5 M Final 2009 REVISED 05252011.XLS,EIA923 SCHEDULES 2_3_4_5 Final 2010.xls,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Final.xlsx,EIA923_Schedules_2_3_4_5_M_11_2023_17JAN2024.xlsx +energy_storage,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Final.xlsx,EIA923_Schedules_2_3_4_5_M_11_2023_17JAN2024.xlsx fuel_receipts_costs,-1,-1,-1,-1,-1,-1,-1,eia923December2008.xls,EIA923 SCHEDULES 2_3_4_5 M Final 2009 REVISED 05252011.XLS,EIA923 SCHEDULES 2_3_4_5 Final 2010.xls,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Final.xlsx,EIA923_Schedules_2_3_4_5_M_11_2023_17JAN2024.xlsx generation_fuel,f906920y2001.xls,f906920y2002.xls,f906920_2003.xls,f906920_2004.xls,f906920_2005.xls,f906920_2006.xls,f906920_2007.xls,eia923December2008.xls,EIA923 SCHEDULES 2_3_4_5 M Final 2009 REVISED 05252011.XLS,EIA923 SCHEDULES 2_3_4_5 Final 2010.xls,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Final.xlsx,EIA923_Schedules_2_3_4_5_M_11_2023_17JAN2024.xlsx generator,-1,-1,-1,-1,-1,-1,-1,eia923December2008.xls,EIA923 SCHEDULES 2_3_4_5 M Final 2009 REVISED 05252011.XLS,EIA923 SCHEDULES 2_3_4_5 Final 2010.xls,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Final.xlsx,EIA923_Schedules_2_3_4_5_M_11_2023_17JAN2024.xlsx diff --git a/src/pudl/package_data/eia923/skiprows.csv b/src/pudl/package_data/eia923/skiprows.csv index 49434987c9..fb75934405 100644 --- a/src/pudl/package_data/eia923/skiprows.csv +++ b/src/pudl/package_data/eia923/skiprows.csv @@ -5,7 +5,7 @@ stocks,7,7,7,7,7,7,7,7,7,7,5,5,5,5,5,5,5,5,5,5,5,5,4 oil_stocks,-1,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,4 coal_stocks,-1,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,-1,-1,-1 petcoke_stocks,-1,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,-1,-1,-1 -energy_storage,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,5,5,5,5,5,4 +energy_storage,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,5,5,5,5,5,5,5,5,5,4 boiler_fuel,-1,-1,-1,-1,-1,-1,-1,7,7,7,5,5,5,5,5,5,5,5,5,5,5,5,4 generator,-1,-1,-1,-1,-1,-1,-1,7,7,7,5,5,5,5,5,5,5,5,5,5,5,5,4 fuel_receipts_costs,-1,-1,-1,-1,-1,-1,-1,7,6,7,4,4,4,4,4,4,4,4,4,4,4,4,3 diff --git a/src/pudl/transform/eia923.py b/src/pudl/transform/eia923.py index 40c9c3cd47..1688c52516 100644 --- a/src/pudl/transform/eia923.py +++ b/src/pudl/transform/eia923.py @@ -548,7 +548,7 @@ def plants_eia923(eia923_dfs, eia923_transformed_dfs): plant_info_df = plant_info_df[ [ "plant_id_eia", - "combined_heat_power", + "associated_combined_heat_power", "plant_state", "sector_id_eia", "naics_code", @@ -560,8 +560,8 @@ def plants_eia923(eia923_dfs, eia923_transformed_dfs): ] ] # Since this is a plain Yes/No variable -- just make it a real sa.Boolean. - plant_info_df.combined_heat_power = plant_info_df.combined_heat_power.replace( - {"N": False, "Y": True} + plant_info_df.associated_combined_heat_power = ( + plant_info_df.associated_combined_heat_power.replace({"N": False, "Y": True}) ) # Get rid of excessive whitespace introduced to break long lines (ugh) @@ -641,7 +641,7 @@ def _core_eia_923__generation_fuel_eia923(raw_eia923__generation_fuel: pd.DataFr # Drop fields we're not inserting into the _core_eia923__generation_fuel table. cols_to_drop = [ - "combined_heat_power", + "associated_combined_heat_power", "plant_name_eia", "operator_name", "operator_id", @@ -654,7 +654,7 @@ def _core_eia_923__generation_fuel_eia923(raw_eia923__generation_fuel: pd.DataFr "electric_fuel_consumption_quantity", "total_fuel_consumption_mmbtu", "elec_fuel_consumption_mmbtu", - "net_generation_megawatthours", + "total_net_generation_mwh", "early_release", ] gen_fuel = gen_fuel.drop(cols_to_drop, axis=1) @@ -855,7 +855,7 @@ def _core_eia923__boiler_fuel(raw_eia923__boiler_fuel: pd.DataFrame) -> pd.DataF # Need to stop dropping fields that contain harvestable entity attributes. # See https://github.com/catalyst-cooperative/pudl/issues/509 cols_to_drop = [ - "combined_heat_power", + "associated_combined_heat_power", "plant_name_eia", "operator_name", "operator_id", @@ -974,7 +974,7 @@ def _core_eia923__generation(raw_eia923__generator: pd.DataFrame) -> pd.DataFram raw_eia923__generator.dropna(subset=["generator_id"]) .drop( [ - "combined_heat_power", + "associated_combined_heat_power", "plant_name_eia", "operator_name", "operator_id",