EDGE-T Validation Output - Fix

Created by: Loisel

• fixes the EDGE-T (edge_esm module) validation generation. Validation PDF can be generated by using output.R. Functionality was broken due to recent changes wrt the reporting facilities to be run on the compute nodes.
• EDGE-T is now ran once again in the output phase of REMIND, generating data to be used for validation and reporting.
• Changes to the EDGE_transport.R script infered changes to calling signatures in edgeTrpLib library, so this has to be updated as well.
• MIF-wise reporting is not yet updated, this will come later.

scripts/iterative/EDGE_transport.R

@@ -70,7 +70,7 @@ EDGE2teESmap <- fread(mapspath("mapping_EDGE_REMIND_transport_categories.csv"))
 ## input data loading
 input_folder = paste0("../../modules/35_transport/edge_esm/input/")
 
-if (length(list.files(path = data_folder, pattern = "RDS")) < 8) {
+if (length(list.files(path = data_folder, pattern = "RDS")) < 7) {
   createRDS(input_folder, data_folder,
             SSP_scenario = scenario,
             EDGE_scenario = EDGE_scenario)
@@ -213,23 +213,6 @@ demByTech <- shares_intensity_demand[["demand"]] ##in [-]
 intensity <- shares_intensity_demand[["demandI"]] ##in million pkm/EJ
 norm_demand <- shares_intensity_demand$demandF_plot_pkm ## total demand is 1, required for costs
 
-if (opt$reporting) {
-  saveRDS(vintages, file=datapath("vintages.RDS"))
-
-  saveRDS(logit_data$share_list, file = datapath("share_newvehicles.RDS"))
-  saveRDS(logit_data$EF_shares, file = datapath("EF_shares.RDS"))
-  saveRDS(logit_data$mj_km_data, file = datapath("mj_km_data.RDS"))
-  saveRDS(nonfuel_costs, file=datapath("nonfuel_costs.RDS"))
-  saveRDS(logit_data$inconv_cost, file=datapath("inco_costs.RDS"))
-
-  saveRDS(shares_intensity_and_demand$demandF_plot_EJ,
-          file=datapath("demandF_plot_EJ.RDS"))
-  saveRDS(shares_intensity_and_demand$demandF_plot_pkm,
-          file=datapath("demandF_plot_pkm.RDS"))
-
-}
-
-
 demand_BEV=calc_num_vehicles(
   norm_dem_BEV = norm_demand[
     technology == "BEV" & ## battery vehicles
@@ -244,6 +227,23 @@ setnames(ES_demand, old ="demand", new = "demandpr")
 saveRDS(ES_demand, datapath("demand_previousiter.RDS"))
 
 
+if (opt$reporting) {
+  saveRDS(vintages, file=datapath("vintages.RDS"))
+
+  saveRDS(logit_data$share_list, file = datapath("share_newvehicles.RDS"))
+  saveRDS(logit_data$EF_shares, file = datapath("EF_shares.RDS"))
+  saveRDS(logit_data$mj_km_data, file = datapath("mj_km_data.RDS"))
+  saveRDS(nonfuel_costs, file=datapath("nonfuel_costs.RDS"))
+  saveRDS(logit_data$inconv_cost, file=datapath("inco_costs.RDS"))
+
+  saveRDS(shares_intensity_demand$demandF_plot_EJ,
+          file=datapath("demandF_plot_EJ.RDS"))
+  saveRDS(shares_intensity_demand$demandF_plot_pkm,
+          file=datapath("demandF_plot_pkm.RDS"))
+  return()
+}
+
+
 
 ## use logit to calculate costs
 budget <- calculate_capCosts(