Merge https://github.com/e3modelling/OPEN-PROM into calibrateTransport

Author: mmadianos

reportOutput.R

@@ -28,6 +28,7 @@ reportOutput <- function(
     fullValidation = TRUE,
     plot_name = NULL,
     Validation_data_for_plots = TRUE,
+    Validation2050 = TRUE,
     emissions = TRUE,
     htmlReport = FALSE, projectReport = FALSE) {
   # Region mapping used for aggregating validation data (e.g. ENERDATA)
@@ -46,43 +47,15 @@ reportOutput <- function(
   metadata <- getMetadata(path = runpath)
   print("Report generation completed.")
 
-  Val_Mif_fullval2 <- ValidationMif(.path = runpath, Validation_data_for_plots = Validation_data_for_plots
-  )
-  
+  # add validation data for plots
   for (i in 1:length(runpath)) {
-    if (!is.null(Val_Mif_fullval2)) {
-      Val_Mif_fullval2[Val_Mif_fullval2==0]=NA
       reportOPEN_PROM <- reports[[i]]
-      #mbind validation data and OPEN-PROM
-      val_years <- getYears(reportOPEN_PROM)
-      Val_Mif <- add_columns(Val_Mif_fullval2, addnm = setdiff(getYears(reportOPEN_PROM),getYears(Val_Mif_fullval2)), dim = 2, fill = NA)
-      Val_Mif <- Val_Mif[,getYears(reportOPEN_PROM),]
-      Val_Mif <- add_columns(Val_Mif, addnm = setdiff(getRegions(reportOPEN_PROM),getRegions(Val_Mif)), dim = 1, fill = NA)
-      Val_Mif <- Val_Mif[getRegions(reportOPEN_PROM),,]
-      
-      Val_Mif[,val_years,"Final Energy|Industry|VAL"] <- Val_Mif[,val_years,"Final Energy|Industry|VAL"] +
-        reportOPEN_PROM[,val_years,"Final Energy|Residential and Commercial"] + reportOPEN_PROM[,val_years,"Final Energy|Transportation"] +
-        reportOPEN_PROM[,val_years,"Final Energy|Non Energy"] + reportOPEN_PROM[,val_years,"Final Energy|Bunkers"]
-      Val_Mif[,val_years,"Final Energy|Transportation|VAL"] <- Val_Mif[,val_years,"Final Energy|Transportation|VAL"] +
-        reportOPEN_PROM[,val_years,"Final Energy|Residential and Commercial"] + reportOPEN_PROM[,val_years,"Final Energy|Non Energy"] +
-        reportOPEN_PROM[,val_years,"Final Energy|Bunkers"]
-      
-      reports_with_val <- mbind(reportOPEN_PROM, Val_Mif)
-      reports[[i]] <- reports_with_val
-    } else {
-      dummy <- new.magpie(getRegions(reports[[i]]), getYears(reports[[i]]), c("Emissions|CO2|VAL",
-                                                                              "Final Energy|Transportation|VAL",
-                                                                              "Final Energy|Industry|VAL",
-                                                                              "Final Energy|VAL",
-                                                                              "Secondary Energy|Electricity|VAL",
-                                                                              "Capacity|Electricity|VAL"), fill = NA)
-      dummy <- add_dimension(dummy, dim = 3.2, add = "unit", nm  = c("Mt CO2/yr","Mtoe","Mtoe","Mtoe","GW","GW"))
-      reports_with_val <- mbind(reports[[i]], dummy)
-      reports[[i]] <- reports_with_val
-    }
+      metadata_run <- getMetadata(path = runpath[[i]])
+      reports[[i]] <- ValidationMif(.path = runpath, Validation_data_for_plots = Validation_data_for_plots,
+                                    reportOPEN_PROM = reportOPEN_PROM, metadata_run = metadata_run,
+                                    Validation2050 = Validation2050)
   }
 
-
   if (!is.null(plot_name)) {
     save_names <- file.path(runpath, plot_name)
     mapply( # for each scenario, unpack the magpie obj and a pdf savename
@@ -100,4 +73,4 @@ runpath <- if (length(args) > 0) args[1] else getRunpath()
 mif_name <- if (length(args) > 1) args[2] else "reporting.mif"
 plot_name <- if (length(args) > 2) args[3] else "plot.tex"
 
-reportOutput(runpath = runpath, mif_name = mif_name, plot_name = plot_name, Validation_data_for_plots = TRUE)
+reportOutput(runpath = runpath, mif_name = mif_name, plot_name = plot_name, Validation_data_for_plots = TRUE, Validation2050 = FALSE)