build

pik-piam · Feb 21, 2025 · 51a7f55 · 51a7f55
1 parent 79dd01d
commit 51a7f55
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 25 deletions.
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '4831920'
+ValidationKey: '4632200'
 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.24.0
-date-released: '2025-02-14'
+version: 0.23.0
+date-released: '2025-02-21'
 abstract: A collection of tools to analyze model runs.
 authors:
 - family-names: Giannousakis

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,21 +1,22 @@
 Package: modelstats
 Type: Package
 Title: Run Analysis Tools
-Version: 0.24.0
-Date: 2025-02-14
+Version: 0.23.0
+Date: 2025-02-21
 Authors@R: c(
     person("Anastasis", "Giannousakis", email = "giannou@pik-potsdam.de", role = c("aut","cre")),
     person("Oliver", "Richters", role = "aut")
   )
 Description: A collection of tools to analyze model runs.
 Imports: 
     dplyr,
-    quitte (>= 0.3140.0),
+    quitte,
     crayon,
     gdx,
     gtools,
     lubridate,
     lucode2,
+    magpie4 (>= 2.18.0),
     piamutils,
     utils,
     gms,

diff --git a/R/modeltests.R b/R/modeltests.R
@@ -278,25 +278,25 @@ evaluateRuns <- function(model, # nolint: cyclocomp_linter.
   if (model == "MAgPIE") {
     for (i in runsStarted[startsWith(runsStarted, "default_")]) {
       changelogVariables <- c(
-        lucEmis = "Emissions|CO2|Land|+|Land-use Change", # +++++
-        tau = "Productivity|Landuse Intensity Indicator Tau", # +++++
-        cropland = "Resources|Land Cover|+|Cropland", # ++++++
-        irrigated = "Resources|Land Cover|Cropland|Area actually irrigated", # +++
-        pasture = "Resources|Land Cover|+|Pastures and Rangelands", # ++++
-        forest = "Resources|Land Cover|+|Forest", # +++
-        other = "Resources|Land Cover|+|Other Land", # ++
+        lucEmis = "Emissions|CO2|Land|+|Land-use Change",
+        tau = "Productivity|Landuse Intensity Indicator Tau",
+        cropland = "Resources|Land Cover|+|Cropland",
+        irrigated = "Resources|Land Cover|Cropland|Area actually irrigated",
+        pasture = "Resources|Land Cover|+|Pastures and Rangelands",
+        forest = "Resources|Land Cover|+|Forest",
+        other = "Resources|Land Cover|+|Other Land",
         # production: in contrast to all other indicators here, this should
         # be robust to calibration issues, but indicate changes in demand/trade
-        production = "Production", # +++
-        costs = "Costs", # ++
-        foodExp = "Household Expenditure|Food|Expenditure" # +
+        production = "Production",
+        costs = "Costs",
+        foodExp = "Household Expenditure|Food|Expenditure"
       )
       try({
-        quitte::addToDataChangelog(report = readRDS(file.path(i, "report.rds")),
-                                   changelog = file.path(gitdir, "data-changelog.csv"),
-                                   versionId = i,
-                                   years = c(2020, 2050, 2100),
-                                   variables = changelogVariables)
+        magpie4::addToDataChangelog(report = readRDS(file.path(i, "report.rds")),
+                                    changelog = file.path(gitdir, "data-changelog.csv"),
+                                    versionId = i,
+                                    years = c(2020, 2050, 2100),
+                                    variables = changelogVariables)
       })
     }
   }

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Run Analysis Tools
 
-R package **modelstats**, version **0.24.0**
+R package **modelstats**, version **0.23.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,17 +47,17 @@ In case of questions / problems please contact Anastasis Giannousakis <giannou@p
 
 To cite package **modelstats** in publications use:
 
-Giannousakis A, Richters O (2025). "modelstats: Run Analysis Tools." Version: 0.24.0, <https://github.com/pik-piam/modelstats>.
+Giannousakis A, Richters O (2025). "modelstats: Run Analysis Tools." Version: 0.23.0, <https://github.com/pik-piam/modelstats>.
 
 A BibTeX entry for LaTeX users is
 
  ```latex
 @Misc{,
   title = {modelstats: Run Analysis Tools},
   author = {Anastasis Giannousakis and Oliver Richters},
-  date = {2025-02-14},
+  date = {2025-02-21},
   year = {2025},
   url = {https://github.com/pik-piam/modelstats},
-  note = {Version: 0.24.0},
+  note = {Version: 0.23.0},
 }
 ```