Merge pull request #96 from dklein-pik/master

Use the fulldata.gdx of a successful SSP2EU-NPi-AMT to update the gdx on the RSE server
pik-piam · Mar 28, 2024 · b2bc0de · b2bc0de
2 parents 0a19691 + 75ab2a3
commit b2bc0de
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 10 deletions.
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '3780463'
+ValidationKey: '3961800'
 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
@@ -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.19.1
-date-released: '2024-03-11'
+version: 0.20.0
+date-released: '2024-03-27'
 abstract: A collection of tools to analyze model runs.
 authors:
 - family-names: Giannousakis

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: modelstats
 Type: Package
 Title: Run Analysis Tools
-Version: 0.19.1
-Date: 2024-03-11
+Version: 0.20.0
+Date: 2024-03-27
 Authors@R: c(
     person("Anastasis", "Giannousakis", email = "[email protected]", role = c("aut","cre")),
     person("Oliver", "Richters", role = "aut")

diff --git a/R/colRunType.R b/R/colRunType.R
@@ -22,10 +22,10 @@ colRunType <- function(mydir = ".") {
     } else {
       out <- cfg$gms$optimization
       if (grepl("^testOneRegi", out)) {
-        out <- paste(if (isTRUE(cfg$gms$cm_nash_mode == "debug")) "debug" else
+        out <- paste(if (isTRUE(cfg$gms$cm_nash_mode == "debug" | cfg$gms$cm_nash_mode == 1)) "debug" else
                      if (isTRUE(cfg$gms$cm_quick_mode == "on")) "quick" else "testOneRegi", cfg$gms$c_testOneRegi_region)
       } else {
-        if (isTRUE(cfg$gms$cm_nash_mode == "debug")) out <- paste0(out, " debug")
+        if (isTRUE(cfg$gms$cm_nash_mode == "debug" | cfg$gms$cm_nash_mode == 1)) out <- paste0(out, " debug")
         if (isTRUE(cfg$gms$CES_parameters == "calibrate")) out <- paste0("Calib_", out)
         if (isTRUE(cfg$gms$cm_MAgPIE_coupling == "on")) out <- paste0(out, " + mag")
       }

diff --git a/R/modeltests.R b/R/modeltests.R
@@ -300,6 +300,12 @@ evaluateRuns <- function(model, mydir, gitPath, compScen, email, mattermostToken
     if (grsi[, "Conv"] %in% c("converged", "converged (had INFES)")) {
       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-NPi-AMT", rownames(grsi))) {
+        gdxOnRseServer <- "rse:/webservice/data/example/remind2_test-convGDX2MIF_fulldata.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))
+      }
       cfg <- NULL
       # Question: is this check really useful? 'Conv' has been checked 4 lines above already.
       # Doesn't this check exclude runs that have 'converged (had INFES)' and 

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Run Analysis Tools
 
-R package **modelstats**, version **0.19.1**
+R package **modelstats**, version **0.20.0**
 
 [![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 <giannou@p
 
 To cite package **modelstats** in publications use:
 
-Giannousakis A, Richters O (2024). _modelstats: Run Analysis Tools_. R package version 0.19.1, <https://github.com/pik-piam/modelstats>.
+Giannousakis A, Richters O (2024). _modelstats: Run Analysis Tools_. R package version 0.20.0, <https://github.com/pik-piam/modelstats>.
 
 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.19.1},
+  note = {R package version 0.20.0},
   url = {https://github.com/pik-piam/modelstats},
 }
 ```