From d07550fc1aa68f5bd7c039468e4142548b70ed33 Mon Sep 17 00:00:00 2001
From: David Klein <dklein@pik-potsdam.de>
Date: Fri, 24 Jan 2020 16:04:24 +0100
Subject: [PATCH] Fix bug in scripts for compareScenarios Delete lusweave
output files after generating runtime.pdf
---
scripts/output/comparison/compareScenarios.R | 3 ++-
scripts/utils/run_compareScenarios.R | 2 --
start_coupled.R | 1 +
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/output/comparison/compareScenarios.R b/scripts/output/comparison/compareScenarios.R
index caaabe7..4019b2c 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 b22d44a..9d53e17 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 cea6775..2a918ef 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")
--
GitLab