diff --git a/scripts/output/comparison/compareScenarios.R b/scripts/output/comparison/compareScenarios.R index caaabe770df8934892032a7d2610e29d34210393..4019b2c2ff2d9094f29a3d423dd6fefd46b90e33 100644 --- a/scripts/output/comparison/compareScenarios.R +++ b/scripts/output/comparison/compareScenarios.R @@ -52,7 +52,8 @@ start_comp <- function(outputdirs,shortTerm,outfilename) { cat("Starting ",jobname,"\n") on_cluster <- file.exists("/p/projects/") if (on_cluster) { - system(paste0("sbatch --qos=standby --job-name=",jobname," --output=",jobname,".out --error=",jobname,".err --mail-type=END --time=200 --mem-per-cpu=8000 Rscript scripts/utils/run_compareScenarios.R outputdirs=",paste(outputdirs,collapse=",")," shortTerm=",shortTerm," outfilename=",jobname)) + clcom <- paste0("sbatch --qos=standby --job-name=",jobname," --output=",jobname,".out --error=",jobname,".err --mail-type=END --time=200 --mem-per-cpu=8000 --wrap=\"Rscript scripts/utils/run_compareScenarios.R outputdirs=",paste(outputdirs,collapse=",")," shortTerm=",shortTerm," outfilename=",jobname,"\"") + system(clcom) } else { outfilename <- jobname tmp.env <- new.env() diff --git a/scripts/utils/run_compareScenarios.R b/scripts/utils/run_compareScenarios.R index b22d44ab369c0b866da3784120cebe718b273ccc..9d53e177a01e16757ba1534ee5c7ce741c1f538e 100644 --- a/scripts/utils/run_compareScenarios.R +++ b/scripts/utils/run_compareScenarios.R @@ -13,8 +13,6 @@ if(!exists("source_include")) { readArgs("outfilename") } -source("compareScenarios.R") - wrap_to_have_a_clean_exit <- function(outputdirs,shortTerm,outfilename) { # Set mif path scenNames <- getScenNames(outputdirs) diff --git a/start_coupled.R b/start_coupled.R index cea6775bc471e1353be83c42eb2aa40a45286ea9..2a918eff313bd307894c9daa489299d621be87c0 100644 --- a/start_coupled.R +++ b/start_coupled.R @@ -225,6 +225,7 @@ start_coupled <- function(path_remind,path_magpie,cfg_rem,cfg_mag,runname,max_it runs <- findCoupledruns(resultsfolder=remindpath) ret <- findIterations(runs,modelpath=c(remindpath,magpiepath),latest=FALSE) readRuntime(ret,plot=TRUE,coupled=TRUE) + unlink(c("runtime.log","runtime.out","runtime.rda")) # combine REMIND and MAgPIE reports of last coupling iteration (and REMIND water reporting if existing) report_rem <- paste0(path_remind,outfolder_rem,"/REMIND_generic_",cfg_rem$title,".mif")