remove start_functions.R, adapt start_bundle_climate.R

start_bundle_climate.R

@@ -4,10 +4,15 @@
 # |  AGPL-3.0, you are granted additional permissions described in the
 # |  REMIND License Exception, version 1.0 (see LICENSE file).
 # |  Contact: remind@pik-potsdam.de
-source("scripts/start_functions.R")
 
 require(lucode, quietly = TRUE, warn.conflicts = FALSE)
 
+source("scripts/start/submit.R")
+source("scripts/start/choose_slurmConfig.R")
+
+# Choose submission type
+slurmConfig <- choose_slurmConfig()
+
 .setgdxcopy <- function(needle, stack, new) {
   # delete entries in stack that contain needle and append new
   out <- c(stack[-grep(needle, stack)], new)
@@ -55,6 +60,7 @@ for (scen in rownames(scenarios)) {
   source("config/default.cfg")
   
   # Have the log output written in a file (not on the screen)
+  cfg$slurmConfig <- slurmConfig
   cfg$logoption  <- 2
   cfg$sequential <- NA
   
@@ -124,6 +130,6 @@ for (scen in rownames(scenarios)) {
      | is.na(settings[scen,"path_gdx_ref"])){
    cat("Starting: ",scen,"\n")
    load(paste0(scen,".RData"))
-   start_run(cfg)
+   submit(cfg)
    }
 }