diff --git a/.buildlibrary b/.buildlibrary index b53add9..286a2f5 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '41987790' +ValidationKey: '42018240' 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 100eb59..f67bd9b 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,8 +2,8 @@ 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.21.11 -date-released: '2024-06-16' +version: 0.21.12 +date-released: '2024-06-21' abstract: A collection of tools to analyze model runs. authors: - family-names: Giannousakis diff --git a/DESCRIPTION b/DESCRIPTION index f1509c9..1195af0 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: modelstats Type: Package Title: Run Analysis Tools -Version: 0.21.11 -Date: 2024-06-16 +Version: 0.21.12 +Date: 2024-06-21 Authors@R: c( person("Anastasis", "Giannousakis", email = "giannou@pik-potsdam.de", role = c("aut","cre")), person("Oliver", "Richters", role = "aut") diff --git a/R/modeltests.R b/R/modeltests.R index e8f434a..a341e63 100644 --- a/R/modeltests.R +++ b/R/modeltests.R @@ -215,8 +215,8 @@ evaluateRuns <- function(model, mydir, gitPath, compScen, email, mattermostToken write(paste0("Path to runs: ", mydir, "output/"), myfile, append = TRUE) if (model == "REMIND") { write(paste0(c("Responsibilities:", - " Robert : SSP2EU-EU21", - " Jess / Oli : SSP2EU", + " Robert : SSP2-EU21", + " Jess / Oli : SSP2", " Bjoern : SDP", " : SSP1", " : SSP5"), collapse = "\n"), myfile, append = TRUE) @@ -303,9 +303,9 @@ evaluateRuns <- function(model, mydir, gitPath, compScen, email, mattermostToken if (grsi[, "Conv"] %in% c("converged", "converged (had INFES)", "not_converged")) { setwd(i) message("Changed to ", normalizePath(".")) - # Use the fulldata.gdx of a successful SSP2EU-NPi-AMT to update the gdx on the RSE server that is used for testing convGDX2MIF - if (grepl("SSP2EU-PkBudg650-AMT", rownames(grsi)) && grsi[, "Conv"] %in% c("converged", "converged (had INFES)")) { - gdxOnRseServer <- "rse@rse.pik-potsdam.de:/webservice/data/example/remind2_test-convGDX2MIF_SSP2EU-PkBudg650-AMT.gdx" + # 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)")) { + gdxOnRseServer <- "rse@rse.pik-potsdam.de:/webservice/data/example/remind2_test-convGDX2MIF_SSP2-PkBudg650-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)) } diff --git a/README.md b/README.md index 8cfcbac..9d9e489 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Run Analysis Tools -R package **modelstats**, version **0.21.11** +R package **modelstats**, version **0.21.12** [![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 (2024). _modelstats: Run Analysis Tools_. R package version 0.21.12, . 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 = {2024}, - note = {R package version 0.21.11}, + note = {R package version 0.21.12}, url = {https://github.com/pik-piam/modelstats}, } ```