Merge pull request #42 from dklein-pik/develop

Bugfix in start scripts (testOneRegi) and compareScenarios

scripts/output/comparison/compareScenarios.R

@@ -52,7 +52,7 @@ start_comp <- function(outputdirs,shortTerm,outfilename) {
   cat("Starting ",jobname,"\n")
   on_cluster <- file.exists("/p/projects/")
   if (on_cluster) {
-    system(paste0("srun --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," &"))
+    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))
   } else {
     outfilename    <- jobname
     tmp.env <- new.env()

scripts/utils/run_compareScenarios.R

@@ -13,6 +13,8 @@ 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)

start.R

@@ -101,6 +101,8 @@ config.file <- argv[1]
 if ('--testOneRegi' %in% argv) {
   testOneRegi <- TRUE
   config.file <- NA
+} else {
+  testOneRegi <- FALSE
 }
 
 if (!is.na(config.file)) {
@@ -137,7 +139,7 @@ for (scen in rownames(scenarios)) {
     cfg$results_folder   <- 'output/testOneRegi'
 
     # delete existing Results directory
-    unlink('output/testOneRegi', recursive = TRUE)
+    cfg$force_replace    <- TRUE
   }
 
   # configure cfg based on settings from csv if provided