Merge branch 'main' into extract-nrel-atb

src/pudl/extract/eia860.py

@@ -77,6 +77,8 @@ def get_dtypes(page, **partition):
     "raw_eia860__generator_existing",
     "raw_eia860__generator_proposed",
     "raw_eia860__generator_retired",
+    "raw_eia860__generator_energy_storage_existing",
+    "raw_eia860__generator_energy_storage_retired",
     "raw_eia860__generator_solar_existing",
     "raw_eia860__generator_solar_retired",
     "raw_eia860__generator_wind_existing",

src/pudl/package_data/eia860/column_maps/generator_energy_storage_existing.csv

@@ -0,0 +1,38 @@
+year_index,2016,2017,2018,2019,2020,2021,2022
+utility_id_eia,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id
+utility_name_eia,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name
+plant_id_eia,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code
+plant_name_eia,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name
+state,state,state,state,state,state,state,state
+county,county,county,county,county,county,county,county
+generator_id,generator_id,generator_id,generator_id,generator_id,generator_id,generator_id,generator_id
+operational_status_code,status,status,status,status,status,status,status
+technology_description,technology,technology,technology,technology,technology,technology,technology
+prime_mover_code,prime_mover,prime_mover,prime_mover,prime_mover,prime_mover,prime_mover,prime_mover
+sector_name_eia,sector_name,sector_name,sector_name,sector_name,sector_name,sector_name,sector_name
+sector_id_eia,sector,sector,sector,sector,sector,sector,sector
+capacity_mw,nameplate_capacity_mw,nameplate_capacity_mw,nameplate_capacity_mw,nameplate_capacity_mw,nameplate_capacity_mw,nameplate_capacity_mw,nameplate_capacity_mw
+summer_capacity_mw,summer_capacity_mw,summer_capacity_mw,summer_capacity_mw,summer_capacity_mw,summer_capacity_mw,summer_capacity_mw,summer_capacity_mw
+winter_capacity_mw,winter_capacity_mw,winter_capacity_mw,winter_capacity_mw,winter_capacity_mw,winter_capacity_mw,winter_capacity_mw,winter_capacity_mw
+generator_operating_month,operating_month,operating_month,operating_month,operating_month,operating_month,operating_month,operating_month
+generator_operating_year,operating_year,operating_year,operating_year,operating_year,operating_year,operating_year,operating_year
+energy_storage_capacity_mwh,nameplate_energy_capacity_mwh,nameplate_energy_capacity_mwh,nameplate_energy_capacity_mwh,nameplate_energy_capacity_mwh,nameplate_energy_capacity_mwh,nameplate_energy_capacity_mwh,nameplate_energy_capacity_mwh
+maximum_charge_rate_mw,maximum_charge_rate_mw,maximum_charge_rate_mw,maximum_charge_rate_mw,maximum_charge_rate_mw,maximum_charge_rate_mw,maximum_charge_rate_mw,maximum_charge_rate_mw
+maximum_discharge_rate_mw,maximum_discharge_rate_mw,maximum_discharge_rate_mw,maximum_discharge_rate_mw,maximum_discharge_rate_mw,maximum_discharge_rate_mw,maximum_discharge_rate_mw,maximum_discharge_rate_mw
+storage_technology_code_1,storage_technology_1,storage_technology_1,storage_technology_1,storage_technology_1,storage_technology_1,storage_technology_1,storage_technology_1
+storage_technology_code_1,storage_technology_2,storage_technology_2,storage_technology_2,storage_technology_2,storage_technology_2,storage_technology_2,storage_technology_2
+storage_technology_code_2,storage_technology_3,storage_technology_3,storage_technology_3,storage_technology_3,storage_technology_3,storage_technology_3,storage_technology_3
+storage_technology_code_3,storage_technology_4,storage_technology_4,storage_technology_4,storage_technology_4,storage_technology_4,storage_technology_4,storage_technology_4
+reactive_power_rating,nameplate_reactive_power_rating,nameplate_reactive_power_rating,nameplate_reactive_power_rating,nameplate_reactive_power_rating,nameplate_reactive_power_rating,nameplate_reactive_power_rating,nameplate_reactive_power_rating
+storage_enclosure_type,storage_enclosure_type,storage_enclosure_type,storage_enclosure_type,storage_enclosure_type,storage_enclosure_type,storage_enclosure_type,storage_enclosure_type
+served_arbitrage_applications,arbitrage,arbitrage,arbitrage,arbitrage,arbitrage,arbitrage,arbitrage
+served_frequency_regulation_applications,frequency_regulation,frequency_regulation,frequency_regulation,frequency_regulation,frequency_regulation,frequency_regulation,frequency_regulation
+served_load_following_applications,load_following,load_following,load_following,load_following,load_following,load_following,load_following
+served_ramping_spinning_reserve_applications,ramping_spinning_reserve,ramping_spinning_reserve,ramping_spinning_reserve,ramping_spinning_reserve,ramping_spinning_reserve,ramping_spinning_reserve,ramping_spinning_reserve
+served_co_located_renewable_firming,co_located_renewable_firming,co_located_renewable_firming,co_located_renewable_firming,co_located_renewable_firming,co_located_renewable_firming,co_located_renewable_firming,co_located_renewable_firming
+served_transmission_and_distribution_deferral_applications,transmission_and_distribution_deferral,transmission_and_distribution_deferral,transmission_and_distribution_deferral,transmission_and_distribution_deferral,transmission_and_distribution_deferral,transmission_and_distribution_deferral,transmission_and_distribution_deferral
+served_system_peak_shaving_applications,system_peak_shaving,system_peak_shaving,system_peak_shaving,system_peak_shaving,system_peak_shaving,system_peak_shaving,system_peak_shaving
+served_load_management_applicaitons,load_management,load_management,load_management,load_management,load_management,load_management,load_management
+served_voltage_or_reactive_power_support_applications,voltage_or_reactive_power_support,voltage_or_reactive_power_support,voltage_or_reactive_power_support,voltage_or_reactive_power_support,voltage_or_reactive_power_support,voltage_or_reactive_power_support,voltage_or_reactive_power_support
+served_backup_power_applicaitons,backup_power,backup_power,backup_power,backup_power,backup_power,backup_power,backup_power
+stored_excess_wind_and_solar_generation,excess_wind_and_solar_generation,excess_wind_and_solar_generation,excess_wind_and_solar_generation,excess_wind_and_solar_generation,excess_wind_and_solar_generation,excess_wind_and_solar_generation,excess_wind_and_solar_generation

src/pudl/package_data/eia860/column_maps/generator_energy_storage_retired.csv

@@ -0,0 +1,40 @@
+year_index,2016,2017,2018,2019,2020,2021,2022
+utility_id_eia,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id
+utility_name_eia,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name
+plant_id_eia,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code
+plant_name_eia,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name
+state,state,state,state,state,state,state,state
+county,county,county,county,county,county,county,county
+generator_id,generator_id,generator_id,generator_id,generator_id,generator_id,generator_id,generator_id
+operational_status_code,status,status,status,status,status,status,status
+technology_description,technology,technology,technology,technology,technology,technology,technology
+prime_mover_code,prime_mover,prime_mover,prime_mover,prime_mover,prime_mover,prime_mover,prime_mover
+sector_name_eia,sector_name,sector_name,sector_name,sector_name,sector_name,sector_name,sector_name
+sector_id_eia,sector,sector,sector,sector,sector,sector,sector
+capacity_mw,nameplate_capacity_mw,nameplate_capacity_mw,nameplate_capacity_mw,nameplate_capacity_mw,nameplate_capacity_mw,nameplate_capacity_mw,nameplate_capacity_mw
+summer_capacity_mw,summer_capacity_mw,summer_capacity_mw,summer_capacity_mw,summer_capacity_mw,summer_capacity_mw,summer_capacity_mw,summer_capacity_mw
+winter_capacity_mw,winter_capacity_mw,winter_capacity_mw,winter_capacity_mw,winter_capacity_mw,winter_capacity_mw,winter_capacity_mw,winter_capacity_mw
+generator_operating_month,,operating_month,operating_month,operating_month,operating_month,operating_month,operating_month
+generator_operating_year,,operating_year,operating_year,operating_year,operating_year,operating_year,operating_year
+generator_retirement_month,retirement_month,retirement_month,retirement_month,retirement_month,retirement_month,retirement_month,retirement_month
+generator_retirement_year,retirement_year,retirement_year,retirement_year,retirement_year,retirement_year,retirement_year,retirement_year
+energy_storage_capacity_mwh,nameplate_energy_capacity_mwh,nameplate_energy_capacity_mwh,nameplate_energy_capacity_mwh,nameplate_energy_capacity_mwh,nameplate_energy_capacity_mwh,nameplate_energy_capacity_mwh,nameplate_energy_capacity_mwh
+maximum_charge_rate_mw,maximum_charge_rate_mw,maximum_charge_rate_mw,maximum_charge_rate_mw,maximum_charge_rate_mw,maximum_charge_rate_mw,maximum_charge_rate_mw,maximum_charge_rate_mw
+maximum_discharge_rate_mw,maximum_discharge_rate_mw,maximum_discharge_rate_mw,maximum_discharge_rate_mw,maximum_discharge_rate_mw,maximum_discharge_rate_mw,maximum_discharge_rate_mw,maximum_discharge_rate_mw
+storage_technology_code_1,storage_technology_1,storage_technology_1,storage_technology_1,storage_technology_1,storage_technology_1,storage_technology_1,storage_technology_1
+storage_technology_code_2,storage_technology_2,storage_technology_2,storage_technology_2,storage_technology_2,storage_technology_2,storage_technology_2,storage_technology_2
+storage_technology_code_3,storage_technology_3,storage_technology_3,storage_technology_3,storage_technology_3,storage_technology_3,storage_technology_3,storage_technology_3
+storage_technology_code_4,storage_technology_4,storage_technology_4,storage_technology_4,storage_technology_4,storage_technology_4,storage_technology_4,storage_technology_4
+reactive_power_rating,nameplate_reactive_power_rating,nameplate_reactive_power_rating,nameplate_reactive_power_rating,nameplate_reactive_power_rating,nameplate_reactive_power_rating,nameplate_reactive_power_rating,nameplate_reactive_power_rating
+storage_enclosure_type,storage_enclosure_type,storage_enclosure_type,storage_enclosure_type,storage_enclosure_type,storage_enclosure_type,storage_enclosure_type,storage_enclosure_type
+served_arbitrage_applications,arbitrage,arbitrage,arbitrage,arbitrage,arbitrage,arbitrage,arbitrage
+served_frequency_regulation_applications,frequency_regulation,frequency_regulation,frequency_regulation,frequency_regulation,frequency_regulation,frequency_regulation,frequency_regulation
+served_load_following_applications,load_following,load_following,load_following,load_following,load_following,load_following,load_following
+served_ramping_spinning_reserve_applications,ramping_spinning_reserve,ramping_spinning_reserve,ramping_spinning_reserve,ramping_spinning_reserve,ramping_spinning_reserve,ramping_spinning_reserve,ramping_spinning_reserve
+served_co_located_renewable_firming,co_located_renewable_firming,co_located_renewable_firming,co_located_renewable_firming,co_located_renewable_firming,co_located_renewable_firming,co_located_renewable_firming,co_located_renewable_firming
+served_transmission_and_distribution_deferral_applications,transmission_and_distribution_deferral,transmission_and_distribution_deferral,transmission_and_distribution_deferral,transmission_and_distribution_deferral,transmission_and_distribution_deferral,transmission_and_distribution_deferral,transmission_and_distribution_deferral
+served_system_peak_shaving_applications,system_peak_shaving,system_peak_shaving,system_peak_shaving,system_peak_shaving,system_peak_shaving,system_peak_shaving,system_peak_shaving
+served_load_management_applicaitons,load_management,load_management,load_management,load_management,load_management,load_management,load_management
+served_voltage_or_reactive_power_support_applications,voltage_or_reactive_power_support,voltage_or_reactive_power_support,voltage_or_reactive_power_support,voltage_or_reactive_power_support,voltage_or_reactive_power_support,voltage_or_reactive_power_support,voltage_or_reactive_power_support
+served_backup_power_applicaitons,backup_power,backup_power,backup_power,backup_power,backup_power,backup_power,backup_power
+stored_excess_wind_and_solar_generation,excess_wind_and_solar_generation,excess_wind_and_solar_generation,excess_wind_and_solar_generation,excess_wind_and_solar_generation,excess_wind_and_solar_generation,excess_wind_and_solar_generation,excess_wind_and_solar_generation

src/pudl/package_data/eia860/file_map.csv

@@ -27,3 +27,5 @@ cooling_equipment,-1,-1,-1,-1,-1,-1,-1,-1,EnviroEquipY09.xls,EnviroEquipY2010.xl
 fgp_equipment,-1,-1,-1,-1,-1,-1,-1,-1,EnviroEquipY09.xls,EnviroEquipY2010.xls,EnviroEquip.xlsx,EnviroEquipY2012.xlsx,6_2_EnviroEquip_Y2013.xlsx,6_2_EnviroEquip_Y2014.xlsx,6_2_EnviroEquip_Y2015.xlsx,6_2_EnviroEquip_Y2016.xlsx,6_2_EnviroEquip_Y2017.xlsx,6_2_EnviroEquip_Y2018.xlsx,6_2_EnviroEquip_Y2019.xlsx,6_2_EnviroEquip_Y2020.xlsx,6_2_EnviroEquip_Y2021.xlsx,6_2_EnviroEquip_Y2022.xlsx
 fgd_equipment,-1,-1,-1,-1,-1,-1,-1,-1,EnviroEquipY09.xls,EnviroEquipY2010.xls,EnviroEquip.xlsx,EnviroEquipY2012.xlsx,6_2_EnviroEquip_Y2013.xlsx,6_2_EnviroEquip_Y2014.xlsx,6_2_EnviroEquip_Y2015.xlsx,6_2_EnviroEquip_Y2016.xlsx,6_2_EnviroEquip_Y2017.xlsx,6_2_EnviroEquip_Y2018.xlsx,6_2_EnviroEquip_Y2019.xlsx,6_2_EnviroEquip_Y2020.xlsx,6_2_EnviroEquip_Y2021.xlsx,6_2_EnviroEquip_Y2022.xlsx
 stack_flue_equipment,-1,-1,-1,-1,-1,-1,-1,-1,EnviroEquipY09.xls,EnviroEquipY2010.xls,EnviroEquip.xlsx,EnviroEquipY2012.xlsx,6_2_EnviroEquip_Y2013.xlsx,6_2_EnviroEquip_Y2014.xlsx,6_2_EnviroEquip_Y2015.xlsx,6_2_EnviroEquip_Y2016.xlsx,6_2_EnviroEquip_Y2017.xlsx,6_2_EnviroEquip_Y2018.xlsx,6_2_EnviroEquip_Y2019.xlsx,6_2_EnviroEquip_Y2020.xlsx,6_2_EnviroEquip_Y2021.xlsx,6_2_EnviroEquip_Y2022.xlsx
+generator_energy_storage_existing,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3_4_Energy_Storage_Y2016.xlsx,3_4_Energy_Storage_Y2017.xlsx,3_4_Energy_Storage_Y2018.xlsx,3_4_Energy_Storage_Y2019.xlsx,3_4_Energy_Storage_Y2020.xlsx,3_4_Energy_Storage_Y2021.xlsx,3_4_Energy_Storage_Y2022.xlsx
+generator_energy_storage_retired,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3_4_Energy_Storage_Y2016.xlsx,3_4_Energy_Storage_Y2017.xlsx,3_4_Energy_Storage_Y2018.xlsx,3_4_Energy_Storage_Y2019.xlsx,3_4_Energy_Storage_Y2020.xlsx,3_4_Energy_Storage_Y2021.xlsx,3_4_Energy_Storage_Y2022.xlsx

src/pudl/package_data/eia860/page_map.csv

@@ -27,3 +27,5 @@ cooling_equipment,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 fgp_equipment,0,0,0,0,0,0,0,0,4,4,4,4,3,3,3,3,3,3,3,3,3,3
 fgd_equipment,0,0,0,0,0,0,0,0,3,3,3,3,4,4,4,4,4,4,4,4,4,4
 stack_flue_equipment,0,0,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+generator_energy_storage_existing,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+generator_energy_storage_retired,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1

src/pudl/package_data/eia860/skipfooter.csv

@@ -27,3 +27,5 @@ cooling_equipment,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1
 fgp_equipment,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1
 fgd_equipment,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1
 stack_flue_equipment,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1
+generator_energy_storage_existing,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+generator_energy_storage_retired,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

src/pudl/package_data/eia860/skiprows.csv

@@ -27,3 +27,5 @@ cooling_equipment,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1
 fgp_equipment,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1
 fgd_equipment,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1
 stack_flue_equipment,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1
+generator_energy_storage_existing,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1
+generator_energy_storage_retired,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1