diff --git a/scripts/start/submit.R b/scripts/start/submit.R index c6590db0650837b7c11d90f6988edd2f8b1a865e..360c4aedd5d7126fdfa264a4afb61c919c9e9b4b 100644 --- a/scripts/start/submit.R +++ b/scripts/start/submit.R @@ -55,7 +55,7 @@ submit <- function(cfg) { log <- format(Sys.time(), paste0(cfg$title,"-%Y-%H-%M-%S-%OS3.log")) system("Rscript prepare_and_run.R") } else { - system(paste0("sbatch --job-name=",cfg$title," --output=",cfg$title,".out --mail-type=END --comment=REMIND --wrap=\"Rscript prepare_and_run.R \" ",cfg$slurmConfig)) + system(paste0("sbatch --job-name=",cfg$title," --output=log.out --mail-type=END --comment=REMIND --wrap=\"Rscript prepare_and_run.R \" ",cfg$slurmConfig)) Sys.sleep(1) } diff --git a/start_coupled.R b/start_coupled.R index 15a924423b0f82b3e6e11779bfe1278f05d817ba..cea6775bc471e1353be83c42eb2aa40a45286ea9 100644 --- a/start_coupled.R +++ b/start_coupled.R @@ -215,7 +215,7 @@ start_coupled <- function(path_remind,path_magpie,cfg_rem,cfg_mag,runname,max_it #start subsequent runs via sbatch for(run in cfg_rem$subsequentruns){ cat("Submitting subsequent run",run,"\n") - system(paste0("sbatch --qos=standby --job-name=",run," --output=",run,".log --mail-type=END --comment=REMIND-MAgPIE --tasks-per-node=13",nr_of_regions," --wrap=\"Rscript start_coupled.R coupled_config=",run,".RData\"")) + system(paste0("sbatch --qos=standby --job-name=",run," --output=",run,".log --mail-type=END --comment=REMIND-MAgPIE --tasks-per-node=",nr_of_regions," --wrap=\"Rscript start_coupled.R coupled_config=C_",run,".RData\"")) } # Read runtime of ALL coupled runs (not just the current scenario) and produce comparison pdf