make sure log is preserved in case of requeueing

remindmodel · Sep 19, 2023 · e1f5218 · e1f5218
1 parent ffcd255
commit e1f5218
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/scripts/start/prepareAndRun.R b/scripts/start/prepareAndRun.R
@@ -22,8 +22,6 @@ prepareAndRun <- function() {
   } else {
     # If "full.gms" exists, the script assumes that a full.gms has been generated before and you want
     # to restart REMIND in the same folder using the gdx that it eventually previously produced.
-    message("\nRestarting REMIND, find old log in 'log_beforeRestart.txt'.")
-    if (file.exists("log.txt")) file.copy("log.txt", "log_beforeRestart.txt", overwrite = TRUE)
     if (file.exists("fulldata.gdx")) file.copy("fulldata.gdx", "input.gdx", overwrite = TRUE)
   }
 

diff --git a/scripts/start/submit.R b/scripts/start/submit.R
@@ -128,9 +128,13 @@ submit <- function(cfg, restart = FALSE, stopOnFolderCreateError = TRUE) {
   if (grepl("^direct", cfg$slurmConfig) || ! isSlurmAvailable()) {
     exitCode <- system("Rscript prepareAndRun.R")
   } else {
+    if (file.exists("log.txt")) {
+      message("\nRestarting REMIND, find old log in 'log_beforeRestart.txt'.")
+      file.rename("log.txt", "log_beforeRestart.R")
+    }
     exitCode <- system(paste0("sbatch --job-name=",
                               cfg$title,
-                              " --output=log.txt",
+                              " --output=log.txt --open-mode=append", # append for requeued jobs
                               " --mail-type=END",
                               " --comment=REMIND",
                               " --wrap=\"Rscript prepareAndRun.R \" ",