diff --git a/analysis/paper/paper.Rmd b/analysis/paper/paper.Rmd index 78ed6fb7c435d1a21d0284d24e477cb6a5ccba41..8c0ed4cfda8520442c270f6f6df1d6fd3cf7ccfd 100644 --- a/analysis/paper/paper.Rmd +++ b/analysis/paper/paper.Rmd @@ -885,8 +885,8 @@ pdat_final_demand = get_sector_summary_by_eu_ntile_direct(eu_q_count) %>% select(eu_q_rank,total_energy_use_tj_new) %>% group_by(eu_q_rank) %>% summarise(total_energy_use_tj_new = sum(total_energy_use_tj_new)) %>% - mutate(pae_energy_use_gj = total_energy_use_tj_new/33417583, - pae_energy_use_gj = pae_energy_use_gj*1000) + mutate(pae_energy_use_tj = total_energy_use_tj_new/33417583, + pae_energy_use_gj = pae_energy_use_tj*1000) df_energy_deciles = pdat_final_demand %>% select(eu_q_rank, pae_energy_use_gj) @@ -958,7 +958,7 @@ c_mean_mer = round((mer[1]+mer[2])/2) ## run once to save file df_all = NULL for (min_energy in seq(from=mer[1], to=mer[2], by=0.25)) { - for (mean_energy in seq(from=mea[1], to=mea[2], by=1)) { + for (mean_energy in seq(from=mea[1], to=mea[2], by=0.25)) { if (min_energy <= mean_energy) { df_all = df_all %>% bind_rows(df_energy_deciles %>% @@ -988,7 +988,7 @@ for (min_energy in seq(from=mer[1], to=mer[2], by=0.25)) { round_by = 10 -huh = readRDS(here("analysis/data/raw/scenarios_fine.rds")) +#huh = readRDS(here("analysis/data/raw/scenarios_fine.rds")) df_all = df_all %>% #readRDS(here("analysis/data/raw/scenarios_fine.rds")) filter(eu_q_rank %in% c(1,10)) %>%