Merge pull request #130 from orichters/master

switch upload to rse folder to NPi
pik-piam · Mar 4, 2025 · c93b90c · c93b90c
2 parents c8a5342 + fe4e3d4
commit c93b90c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/R/loopRuns.R b/R/loopRuns.R
@@ -55,7 +55,10 @@ loopRuns <- function(mydir, user = NULL, colors = TRUE, sortbytime = TRUE) {
   cat(underline(paste(coltitles, collapse = colSep)), "\n")
   for (i in mydir) {
     status <- try(getRunStatus(i, user = user))
-    if (! file.exists(paste0(i, "/", grep("^config.*|^log.txt$", dir(i), value = TRUE)[1])) && status[["jobInSLURM"]] == "no") next
+    if (! file.exists(paste0(i, "/", grep("^config.*|^log.txt$", dir(i), value = TRUE)[1])) && status[["jobInSLURM"]] == "no") {
+      cat(paste(i, "skipped.\n"))
+      next
+    }
     if (inherits(status, "try-error")) {
       cat(basename(i), "skipped because of error\n")
       next

diff --git a/R/modeltests.R b/R/modeltests.R
@@ -337,9 +337,9 @@ evaluateRuns <- function(model, # nolint: cyclocomp_linter.
       message("Changed to ", normalizePath("."))
       # Use the fulldata.gdx of a successful SSP2-NPi-AMT to update the gdx on the
       # RSE server that is used for testing convGDX2MIF
-      if (grepl("SSP2-PkBudg650-AMT", rownames(grsi)) && grsi[, "Conv"] %in% c("converged", "converged (had INFES)")) {
+      if (grepl("SSP2-NPi-AMT", rownames(grsi)) && grsi[, "Conv"] %in% c("converged", "converged (had INFES)")) {
         gdxOnRseServer <- paste0("rse@rse.pik-potsdam.de:/webservice/data/example/",
-                                 "remind2_test-convGDX2MIF_SSP2-PkBudg650-AMT.gdx")
+                                 "remind2_test-convGDX2MIF_SSP2-NPi-AMT.gdx")
         message(paste("Updating the gdx on the RSE server", gdxOnRseServer, "with the fulldata.gdx of", rownames(grsi)))
         system(paste("rsync -e ssh -av fulldata.gdx", gdxOnRseServer))
       }