diff --git a/config/scenario_config_coupled_SSPSDP.csv b/config/scenario_config_coupled_SSPSDP.csv
index 160ea3e80e1f4b95cd6425a1b729d4a6dadedc8a..b6bd3bdd58ab1aefe0e196cf4ce4e47d34643547 100644
--- a/config/scenario_config_coupled_SSPSDP.csv
+++ b/config/scenario_config_coupled_SSPSDP.csv
@@ -5,39 +5,22 @@ SSP1-NPi;0;;;SSP1,NPI;y2150;;;;
SSP1-PkBudg900;0;;;SSP1,NDC;y2020;;;;
SSP1-PkBudg1100;0;;;SSP1,NDC;y2020;;;;
SSP1-PkBudg1300;0;;;SSP1,NDC;y2020;;;;
-SSP1-Budg1300;0;;;SSP1,NDC;y2020;;;;
-SSP1-Budg950;0;;;SSP1,NDC;y2020;;;;
-SSP1-Budg600;0;;;SSP1,NDC;y2020;;;;
SSP2-Base;0;;;SSP2,NPI;y2150;;;;
SSP2-NDC;0;;;SSP2,NDC;y2150;;;;
SSP2-NPi;0;;;SSP2,NPI;y2150;;;;
SSP2-PkBudg900;0;;;SSP2,NDC;y2020;;;;
SSP2-PkBudg1100;0;;;SSP2,NDC;y2020;;;;
SSP2-PkBudg1300;0;;;SSP2,NDC;y2020;;;;
-SSP2-Budg1300;0;;;SSP2,NDC;y2020;;;;
-SSP2-Budg950;0;;;SSP2,NDC;y2020;;;;
-SSP2-Budg600;0;;;SSP2,NDC;y2020;;;;
SSP5-Base;0;;;SSP5,NPI;y2150;;;;
SSP5-NDC;0;;;SSP5,NDC;y2150;;;;
SSP5-NPi;0;;;SSP5,NPI;y2150;;;;
SSP5-PkBudg900;0;;;SSP5,NDC;y2020;;;;
SSP5-PkBudg1100;0;;;SSP5,NDC;y2020;;;;
SSP5-PkBudg1300;0;;;SSP5,NDC;y2020;;;;
-SSP5-Budg1300;0;;;SSP5,NDC;y2020;;;;
-SSP5-Budg950;0;;;SSP5,NDC;y2020;;;;
-SSP5-Budg600;0;;;SSP5,NDC;y2020;;;;
SDP-Base;0;;;SDP,NPI;y2150;;;;
SDP-NDC;0;;;SDP,NDC;y2150;;;;
SDP-NPi;0;;;SDP,NPI;y2150;;;;
SDP-PkBudg900;0;;;SDP,NDC;y2020;;;;
-SDP-PkBudg1000;1;SDP-PkBudg900;;SDP,NDC;y2020;;;;
+SDP-PkBudg1000;0;;;SDP,NDC;y2020;;;;
SDP-PkBudg1100;0;;;SDP,NDC;y2020;;;;
SDP-PkBudg1300;0;;;SDP,NDC;y2020;;;;
-SDP-Budg1300;0;;;SDP,NDC;y2020;;;;
-SDP-Budg950;0;;;SDP,NDC;y2020;;;;
-SDP-Budg600;0;;;SDP,NDC;y2020;;;;
-SDP-PkBudg1000-aff760;1;SDP-PkBudg900;;SDP,NDC;y2020;;;;
-SDP-PkBudg1000-aff900;1;SDP-PkBudg900;;SDP,NDC;y2020;;;;
-SDP-PkBudg1000-affInf;1;SDP-PkBudg900;;SDP,NDC;y2020;;;;
-SDP-PkBudg1000-cost3;1;SDP-PkBudg900;;SDP,NDC;y2020;;;;
-SDP-PkBudg1000-cost2;1;SDP-PkBudg900;;SDP,NDC;y2020;;;;
diff --git a/scripts/output/comparison/compareScenarios.R b/scripts/output/comparison/compareScenarios.R
index 4019b2c2ff2d9094f29a3d423dd6fefd46b90e33..6d484c02b90b19ed82d482f5dc638cb8ed5b497a 100644
--- a/scripts/output/comparison/compareScenarios.R
+++ b/scripts/output/comparison/compareScenarios.R
@@ -15,22 +15,19 @@ if (exists("outputdirs")) {
} else {
# This is the case if this script was called directly via Rscript
listofruns <- list(
- #list(period = "both", set = "cpl-Base", dirs = c("coupled-remind_SDP-Base-rem-5", "coupled-remind_SSP1-Base-rem-5", "coupled-remind_SSP2-Base-rem-5", "coupled-remind_SSP5-Base-rem-5")),
- #list(period = "both", set = "cpl-PkBudg900", dirs = c("coupled-remind_SDP-PkBudg900-rem-5", "coupled-remind_SSP1-PkBudg900-rem-5", "coupled-remind_SSP2-PkBudg900-rem-5", "coupled-remind_SSP5-PkBudg900-rem-5")),
- #list(period = "both", set = "cpl-PkBudg1100", dirs = c("coupled-remind_SDP-PkBudg1100-rem-5", "coupled-remind_SSP1-PkBudg1100-rem-5", "coupled-remind_SSP2-PkBudg1100-rem-5", "coupled-remind_SSP5-PkBudg1100-rem-5")),
- #list(period = "both", set = "cpl-PkBudg1300", dirs = c("coupled-remind_SDP-PkBudg1300-rem-3", "coupled-remind_SSP1-PkBudg1300-rem-5", "coupled-remind_SSP2-PkBudg1300-rem-5", "coupled-remind_SSP5-PkBudg1300-rem-5")),
+ #list(period = "both", set = "cpl-Base", dirs = c("C_SDP-Base-rem-5", "C_SSP1-Base-rem-5", "C_SSP2-Base-rem-5", "C_SSP5-Base-rem-5")),
+ #list(period = "both", set = "cpl-PkBudg900", dirs = c("C_SDP-PkBudg900-rem-5", "C_SSP1-PkBudg900-rem-5", "C_SSP2-PkBudg900-rem-5", "C_SSP5-PkBudg900-rem-5")),
+ #list(period = "both", set = "cpl-PkBudg1100", dirs = c("C_SDP-PkBudg1100-rem-5", "C_SSP1-PkBudg1100-rem-5", "C_SSP2-PkBudg1100-rem-5", "C_SSP5-PkBudg1100-rem-5")),
+ #list(period = "both", set = "cpl-PkBudg1300", dirs = c("C_SDP-PkBudg1300-rem-5", "C_SSP1-PkBudg1300-rem-5", "C_SSP2-PkBudg1300-rem-5", "C_SSP5-PkBudg1300-rem-5")),
+ #list(period = "both", set = "cpl-NPi", dirs = c("C_SDP-NPi-rem-5", "C_SSP1-NPi-rem-5", "C_SSP2-NPi-rem-5", "C_SSP5-NPi-rem-5")),
- #list(period = "both", set = "cpl-SDP", dirs = c("coupled-remind_SDP-Base-rem-5", "coupled-remind_SDP-PkBudg1300-rem-3", "coupled-remind_SDP-PkBudg1100-rem-5", "coupled-remind_SDP-PkBudg900-rem-5")),
- list(period = "both", set = "cpl-SDP-1100", dirs = c("coupled-remind_SDP-Base-rem-5", "coupled-remind_SDP-PkBudg1300-rem-3", "coupled-remind_SDP-PkBudg1100-rem-5", "coupled-remind_SDP-PkBudg1000-rem-5")),
- #list(period = "both", set = "cpl-SSP1", dirs = c("coupled-remind_SSP1-Base-rem-5", "coupled-remind_SSP1-PkBudg1300-rem-5", "coupled-remind_SSP1-PkBudg1100-rem-5", "coupled-remind_SSP1-PkBudg900-rem-5")),
- #list(period = "both", set = "cpl-SSP2", dirs = c("coupled-remind_SSP2-Base-rem-5", "coupled-remind_SSP2-PkBudg1300-rem-5", "coupled-remind_SSP2-PkBudg1100-rem-5", "coupled-remind_SSP2-PkBudg900-rem-5", "coupled-remind_SSP2-NDC-rem-5")),
- #list(period = "both", set = "cpl-SSP5", dirs = c("coupled-remind_SSP5-Base-rem-5", "coupled-remind_SSP5-PkBudg1300-rem-5", "coupled-remind_SSP5-PkBudg1100-rem-5", "coupled-remind_SSP5-PkBudg900-rem-5")),
+ #list(period = "both", set = "cpl-SDP", dirs = c("C_SDP-Base-rem-5", "C_SDP-NPi-rem-5", "C_SDP-PkBudg1300-rem-5", "C_SDP-PkBudg1100-rem-5", "C_SDP-PkBudg1000-rem-5")),
+ #list(period = "both", set = "cpl-SSP1", dirs = c("C_SSP1-Base-rem-5", "C_SSP1-NPi-rem-5", "C_SSP1-PkBudg1300-rem-5", "C_SSP1-PkBudg1100-rem-5", "C_SSP1-PkBudg900-rem-5")),
+ list(period = "both", set = "cpl-SSP2", dirs = c("C_SSP2-Base-rem-5", "C_SSP2-NPi-rem-5", "C_SSP2-PkBudg1300-rem-5", "C_SSP2-PkBudg1100-rem-5", "C_SSP2-PkBudg900-rem-5")), #, "C_SSP2-NDC-rem-5"
+ #list(period = "both", set = "cpl-SSP5", dirs = c("C_SSP5-Base-rem-5", "C_SSP5-NPi-rem-5", "C_SSP5-PkBudg1300-rem-5", "C_SSP5-PkBudg1100-rem-5", "C_SSP5-PkBudg900-rem-5")),
- #list(period = "both", set = "cpl-aff", dirs = c("coupled-remind_SDP-PkBudg1000-rem-5", "coupled-remind_SDP-PkBudg1000-affInf-rem-5","coupled-remind_SDP-PkBudg1000-aff900-rem-3","coupled-remind_SDP-PkBudg1000-aff760-rem-5","coupled-remind_SDP-PkBudg1000-cost3-rem-5","coupled-remind_SDP-PkBudg1000-cost2-rem-5")),
- #list(period = "both", set = "cplstd-SDP", dirs = c("coupled-remind_SDP-Base-rem-5", "SDP-Base_2019-10-23_10.40.27/")), # "coupled-remind_SDP-PkBudg1300-rem-5", "coupled-remind_SDP-PkBudg1100-rem-5", "coupled-remind_SDP-PkBudg900-rem-5", , "SDP-PkBudg1300_2019-10-23_13.54.55/", "SDP-PkBudg1100_2019-10-23_13.52.02/", "SDP-PkBudg900_2019-10-23_13.49.07/"
- #list(period = "both", set = "cplstd-SSP1", dirs = c("coupled-remind_SSP1-Base-rem-5", "coupled-remind_SSP1-PkBudg1300-rem-5", "coupled-remind_SSP1-PkBudg1100-rem-5", "coupled-remind_SSP1-PkBudg900-rem-5", "SSP1-Base_2019-10-23_10.36.05/", "SSP1-PkBudg1300_2019-10-23_13.42.42/", "SSP1-PkBudg1100_2019-10-23_13.40.05/", "SSP1-PkBudg900_2019-10-23_13.37.18/")),
- #list(period = "both", set = "cplstd-SSP2", dirs = c("coupled-remind_SSP2-Base-rem-5", "coupled-remind_SSP2-NDC-rem-5", "coupled-remind_SSP2-PkBudg1300-rem-5", "coupled-remind_SSP2-PkBudg900-rem-5", "SSP2-Base_2019-10-23_10.44.15/", "SSP2-NDC_2019-10-23_11.57.53/", "SSP2-PkBudg1300_2019-10-23_14.03.57/", "SSP2-PkBudg900_2019-10-23_13.58.02/")), # , "coupled-remind_SSP2-PkBudg1100-rem-5" "SSP2-PkBudg1100_2019-10-23_14.01.04/",
- #list(period = "both", set = "cplstd-SSP5", dirs = c("coupled-remind_SSP5-Base-rem-5", "SSP5-Base_2019-10-23_10.47.50/")), # , "coupled-remind_SSP5-PkBudg1300-rem-5", "coupled-remind_SSP5-PkBudg1100-rem-5", "coupled-remind_SSP5-PkBudg900-rem-5" , "SSP5-PkBudg1300_2019-10-23_14.16.09/", "SSP5-PkBudg1100_2019-10-23_14.13.22/", "SSP5-PkBudg900_2019-10-23_14.10.35/"
+ #list(period = "both", set = "cpl-PkBudg900-plant-vgl", dirs = c("C_SDP-PkBudg900-plant-rem-5", "C_SDP-PkBudg900-rem-5", "C_SSP2-PkBudg900-plant-rem-5", "C_SSP2-PkBudg900-rem-5")),
+ #list(period = "both", set = "cpl-PkBudg900-plant", dirs = c("C_SDP-PkBudg900-plant-rem-5", "C_SSP1-PkBudg900-plant-rem-5", "C_SSP2-PkBudg900-plant-rem-5", "C_SSP5-PkBudg900-plant-rem-5")),
NULL)
}
diff --git a/scripts/start/prepare_and_run.R b/scripts/start/prepare_and_run.R
index 320e62edbbf20852534062afda6aafdf8f283e12..93e4f5c8f8d3980d44201454090d562780f2d3d7 100644
--- a/scripts/start/prepare_and_run.R
+++ b/scripts/start/prepare_and_run.R
@@ -144,6 +144,8 @@ getReportData <- function(path_to_report,inputpath_mag="magpie",inputpath_acc="c
prepare_and_run <- function() {
+ start_time <- Sys.time()
+
# Load libraries
require(lucode, quietly = TRUE,warn.conflicts =FALSE)
require(magclass, quietly = TRUE,warn.conflicts =FALSE)
@@ -799,6 +801,13 @@ prepare_and_run <- function() {
###########################################################################################################################################################
###########################################################################################################################################################
+ end_time <- Sys.time()
+ # Save run statistics to local file
+ cat("Saving start_time and end_time to runstatistics.rda\n")
+ lucode::runstatistics(file = paste0(cfg$results_folder,"/runstatistics.rda"),
+ starttime = start_time,
+ endtime = end_time)
+
return(cfg$results_folder)
# on.exit sets working directory back to results folder