diff --git a/.buildlibrary b/.buildlibrary index 9380cd8..2e8b908 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '3078299' +ValidationKey: '3097906' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' diff --git a/CITATION.cff b/CITATION.cff index badeb78..9a65cac 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,7 +2,7 @@ cff-version: 1.2.0 message: If you use this software, please cite it using the metadata from this file. type: software title: 'modelstats: Run Analysis Tools' -version: 0.15.7 +version: 0.15.8 date-released: '2023-09-07' abstract: A collection of tools to analyze model runs. authors: diff --git a/DESCRIPTION b/DESCRIPTION index b941127..0737590 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: modelstats Type: Package Title: Run Analysis Tools -Version: 0.15.7 +Version: 0.15.8 Date: 2023-09-07 Authors@R: c( person("Anastasis", "Giannousakis", email = "giannou@pik-potsdam.de", role = c("aut","cre")), diff --git a/R/getRunStatus.R b/R/getRunStatus.R index 8780728..ed0e9db 100644 --- a/R/getRunStatus.R +++ b/R/getRunStatus.R @@ -177,8 +177,10 @@ getRunStatus <- function(mydir = dir(), sort = "nf", user = NULL) { cf <- try(quitte::as.quitte(readGDX(gdx = abortgdx, "p80_trackConsecFail", react = "silent")), silent = TRUE) if (! inherits(maxinfes, "try-error") && isTRUE(maxinfes > 0) && ! inherits(cf, "try-error") && ! is.null(cf)) { cf <- unique(cf[cf$value == maxinfes, ]$region) - cf <- if (length(cf) == 1) paste0(cf, " ") else paste0(length(cf), "R*") - if (length(cf) > 0) out[i, "RunStatus"] <- paste0("Abort ", cf, maxinfes, "*Infes") + if (length(cf) > 0) { + cf <- if (length(cf) == 1) paste0(cf, " ") else paste0(length(cf), "R*") + out[i, "RunStatus"] <- paste0("Abort ", cf, maxinfes, "*Infes") + } } } if (file.exists(logmagtxt) && out[i, "jobInSLURM"] != "no" && (out[i, "RunStatus"] == "Normal completion" || grepl("log-mag.txt", logmagtxt))) { diff --git a/README.md b/README.md index 0000d1d..3227861 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Run Analysis Tools -R package **modelstats**, version **0.15.7** +R package **modelstats**, version **0.15.8** [![CRAN status](https://www.r-pkg.org/badges/version/modelstats)](https://cran.r-project.org/package=modelstats) [![R build status](https://github.com/pik-piam/modelstats/workflows/check/badge.svg)](https://github.com/pik-piam/modelstats/actions) [![codecov](https://codecov.io/gh/pik-piam/modelstats/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/modelstats) [![r-universe](https://pik-piam.r-universe.dev/badges/modelstats)](https://pik-piam.r-universe.dev/builds) @@ -47,7 +47,7 @@ In case of questions / problems please contact Anastasis Giannousakis . +Giannousakis A, Richters O (2023). _modelstats: Run Analysis Tools_. R package version 0.15.8, . A BibTeX entry for LaTeX users is @@ -56,7 +56,7 @@ A BibTeX entry for LaTeX users is title = {modelstats: Run Analysis Tools}, author = {Anastasis Giannousakis and Oliver Richters}, year = {2023}, - note = {R package version 0.15.7}, + note = {R package version 0.15.8}, url = {https://github.com/pik-piam/modelstats}, } ```