Commit 6c9a4cb7 authored by Turner's avatar Turner
Browse files

2022 add

parent 4dcc2867

R/EIA_xl_readers.R

+18 −10
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ get_EIA_annual_gen <- function(gnr_dir, plt_dir){ 
    pull(EIA_ID) ->

    target_plants



  1990:2021L |>

  1990:2022L |>

    map_dfr(function(yr){

      

      if(yr %in% 1990:1991){
@@ -246,7 +246,7 @@ get_EIA_annual_gen <- function(gnr_dir, plt_dir){ 
        )

      }



      if(yr %in% 2013:2021){

      if(yr %in% 2013:2022){

        suppressWarnings(

          read_xlsx(paste0(

            plt_dir, "/eia860",
@@ -266,7 +266,7 @@ get_EIA_annual_gen <- function(gnr_dir, plt_dir){ 
        left_join(nameplate_all, by = join_by(EIA_ID)) |>

        mutate(year = !!yr)

    }

    ) -> plant_nameplate_MW_1990_2021

    ) -> plant_nameplate_MW_1990_2022



  # reported plant capacity pre-1990 is available only via generation data files...
@@ -294,7 +294,7 @@ get_EIA_annual_gen <- function(gnr_dir, plt_dir){ 
  

  bind_rows(

    plant_nameplate_MW_1970_1989,

    plant_nameplate_MW_1990_2021

    plant_nameplate_MW_1990_2022

  ) -> plant_nameplant_MW
@@ -456,8 +456,16 @@ get_EIA_annual_gen <- function(gnr_dir, plt_dir){ 
              rename(EIA_ID = `Plant Id`) ->

              EIA_data

          )

        }

          



          if(yr == 2022){

            file_name <- paste0(gnr_dir, "f923_", yr,

                                "/EIA923_Schedules_2_3_4_5_M_12_2022_Final.xlsx")

            suppressWarnings(

              read_xlsx(file_name, skip = 5, .name_repair = "unique_quiet")  |>

                rename(EIA_ID = `Plant Id`) ->

                EIA_data

            )

        }



        # filter EIA file for hydro
@@ -482,7 +490,7 @@ get_EIA_annual_gen <- function(gnr_dir, plt_dir){ 
            mutate(year = !!yr)

        )

      }

    }) -> EIA_hydro_netgen_2001_2021

    }) -> EIA_hydro_netgen_2001_2022





  # generate table of hrs per year for computation of maximum output
@@ -496,7 +504,7 @@ get_EIA_annual_gen <- function(gnr_dir, plt_dir){ 
  # combine nameplate and generation to get CF

  bind_rows(

    gen_1970_2000,

    EIA_hydro_netgen_2001_2021 |>

    EIA_hydro_netgen_2001_2022 |>

      rename(gen_MWh = MWh)

  ) |>

    left_join(plant_nameplate_MW_interpolated,
@@ -504,9 +512,9 @@ get_EIA_annual_gen <- function(gnr_dir, plt_dir){ 
    left_join(hrs_per_year, join_by(year)) |>

    mutate(cap_MWh = nameplate * n_hrs,

           CF = gen_MWh / cap_MWh) ->

    gen_cap_CF_1970_2021

    gen_cap_CF_1970_2022



  return(gen_cap_CF_1970_2021)

  return(gen_cap_CF_1970_2022)





}

_targets.R

+4 −4
Original line number Diff line number Diff line
@@ -55,20 +55,20 @@ list( 
    format = "file"

  ),

  tar_target(

    EIA_annual_gen_cap_CF_1970_2021,

    EIA_annual_gen_cap_CF_1970_2022,

    get_EIA_annual_gen(gnr_dir = EIA_529_906_920_923,

                       plt_dir = EIA_860),

    format = "parquet"

  ),

  tar_target(

    dam_annual_gen_cap_CF_1970_2021,

    dam_annual_gen_cap_CF_1970_2022,

    convert_EIA_to_COMPLX(EHA = EHA,

                          EIA_data = EIA_annual_gen_cap_CF_1970_2021),

                          EIA_data = EIA_annual_gen_cap_CF_1970_2022),

    format = "parquet"

  ),

  tar_target(

    CF_trends,

    get_CF_trends(annual_CFs = dam_annual_gen_cap_CF_1970_2021),

    get_CF_trends(annual_CFs = dam_annual_gen_cap_CF_1970_2022),

    format = "parquet"

  ),

  tar_target(