From 644857f8e6de7dc814b1979f6cd61f902cdd9d08 Mon Sep 17 00:00:00 2001 From: orichters Date: Fri, 21 Jun 2024 09:04:25 +0200 Subject: [PATCH 1/4] adjust tests to SSP2EU -> SSP2 rename --- R/loadModeltest.R | 4 ++-- tests/testthat/test-convGDX2mif.R | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/R/loadModeltest.R b/R/loadModeltest.R index 2e05a2e6..a60e9e77 100644 --- a/R/loadModeltest.R +++ b/R/loadModeltest.R @@ -117,14 +117,14 @@ cs2InputPaths <- function(outputDirs) { #' ssp1 <- new.env() #' ssp2eu <- new.env() #' loadModeltest(ssp1, "^SSP1-AMT-") -#' loadModeltest(ssp2eu, "^SSP2EU-.*-AMT$") +#' loadModeltest(ssp2eu, "^SSP2-.*-AMT$") #' ssp1$data #' ssp2eu$data #' } #' @export loadModeltest <- function( envir = globalenv(), - namePattern = "^SSP2EU-.*-AMT$", + namePattern = "^SSP2-.*-AMT$", folder = tempdir() ) { diff --git a/tests/testthat/test-convGDX2mif.R b/tests/testthat/test-convGDX2mif.R index 587b4e9d..77ae6a54 100644 --- a/tests/testthat/test-convGDX2mif.R +++ b/tests/testthat/test-convGDX2mif.R @@ -13,9 +13,9 @@ library(gdx) test_that("Test if REMIND reporting is produced as it should and check data integrity", { skip_if_not(as.logical(gdxrrw::igdx(silent = TRUE)), "gdxrrw is not initialized properly") - # GDXs for comparison. Once the remind2::reportEmi does not report negative gross emissions we will switch to SSP2EU-EU21-PkBudg and SSP2EU-NPi + # GDXs for comparison. Once the remind2::reportEmi does not report negative gross emissions we will switch to SSP2-EU21-PkBudg and SSP2-NPi gdxList <- c("fulldata-release.gdx" = "https://rse.pik-potsdam.de/data/example/remind2_test-convGDX2MIF_SSP2EU-EU21-NPi_2024-03-28_10.23.13.gdx", - "fulldata-AMT.gdx" = "https://rse.pik-potsdam.de/data/example/remind2_test-convGDX2MIF_SSP2EU-PkBudg650-AMT.gdx") + "fulldata-AMT.gdx" = "https://rse.pik-potsdam.de/data/example/remind2_test-convGDX2MIF_SSP2-PkBudg650-AMT.gdx") gdxPaths <- NULL for (i in seq_along(gdxList)) { From 36e8cb87a6d13c3cf2306ffeda14b41317b5ebc7 Mon Sep 17 00:00:00 2001 From: orichters Date: Tue, 25 Jun 2024 17:29:41 +0200 Subject: [PATCH 2/4] relax summation check strictness --- R/convGDX2MIF.R | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/R/convGDX2MIF.R b/R/convGDX2MIF.R index cbfa0aa1..50718201 100644 --- a/R/convGDX2MIF.R +++ b/R/convGDX2MIF.R @@ -151,9 +151,8 @@ convGDX2MIF <- function(gdx, gdx_ref = NULL, file = NULL, scenario = "default", sumChecks <- checkSummations( mifFile = output, dataDumpFile = NULL, outputDirectory = NULL, summationsFile = "extractVariableGroups", - absDiff = 1.5e-8, relDiff = 1e-8, roundDiff = TRUE - ) %>% - filter(abs(.data$diff) >= 1.5e-8), + absDiff = 0.01, relDiff = 0.02, roundDiff = TRUE + ), type = 'message') %>% .reportSummationErrors(testthat = testthat) @@ -161,8 +160,7 @@ convGDX2MIF <- function(gdx, gdx_ref = NULL, file = NULL, scenario = "default", mifFile = output, dataDumpFile = NULL, outputDirectory = NULL, summationsFile = system.file('extdata/additional_summation_checks.csv', package = 'remind2'), - absDiff = 1.5e-8, relDiff = 1e-8, roundDiff = TRUE) %>% - filter(abs(.data$diff) >= 1.5e-8) %>% + absDiff = 0.01, relDiff = 0.02, roundDiff = TRUE) %>% bind_rows(sumChecks), type = 'message' ) %>% From 3d55476072ebbb271723dfe379858e94587c8891 Mon Sep 17 00:00:00 2001 From: orichters Date: Tue, 2 Jul 2024 15:57:26 +0200 Subject: [PATCH 3/4] update gdx weblinks --- inst/compareScenarios/cs_06_energy_services.Rmd | 1 + man/loadModeltest.Rd | 4 ++-- tests/testthat/test-convGDX2mif.R | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/inst/compareScenarios/cs_06_energy_services.Rmd b/inst/compareScenarios/cs_06_energy_services.Rmd index d863e9ec..4a39029c 100644 --- a/inst/compareScenarios/cs_06_energy_services.Rmd +++ b/inst/compareScenarios/cs_06_energy_services.Rmd @@ -429,6 +429,7 @@ if ("Production|Industry|Steel|BF-BOF" %in% levels(data$variable)){ # if process showAreaAndBarPlots(droute, items, tot, orderVars="user", scales = "fixed") } ``` + ### Subsector per-Capita Production ```{r plot subsector per-capita production} items <- c("Production|Industry|Cement|per-capita", diff --git a/man/loadModeltest.Rd b/man/loadModeltest.Rd index 8a340387..74212af8 100644 --- a/man/loadModeltest.Rd +++ b/man/loadModeltest.Rd @@ -6,7 +6,7 @@ \usage{ loadModeltest( envir = globalenv(), - namePattern = "^SSP2EU-.*-AMT$", + namePattern = "^SSP2-.*-AMT$", folder = tempdir() ) } @@ -30,7 +30,7 @@ loadModeltest() ssp1 <- new.env() ssp2eu <- new.env() loadModeltest(ssp1, "^SSP1-AMT-") -loadModeltest(ssp2eu, "^SSP2EU-.*-AMT$") +loadModeltest(ssp2eu, "^SSP2-.*-AMT$") ssp1$data ssp2eu$data } diff --git a/tests/testthat/test-convGDX2mif.R b/tests/testthat/test-convGDX2mif.R index 77ae6a54..423f9f86 100644 --- a/tests/testthat/test-convGDX2mif.R +++ b/tests/testthat/test-convGDX2mif.R @@ -13,9 +13,9 @@ library(gdx) test_that("Test if REMIND reporting is produced as it should and check data integrity", { skip_if_not(as.logical(gdxrrw::igdx(silent = TRUE)), "gdxrrw is not initialized properly") - # GDXs for comparison. Once the remind2::reportEmi does not report negative gross emissions we will switch to SSP2-EU21-PkBudg and SSP2-NPi - gdxList <- c("fulldata-release.gdx" = "https://rse.pik-potsdam.de/data/example/remind2_test-convGDX2MIF_SSP2EU-EU21-NPi_2024-03-28_10.23.13.gdx", - "fulldata-AMT.gdx" = "https://rse.pik-potsdam.de/data/example/remind2_test-convGDX2MIF_SSP2-PkBudg650-AMT.gdx") + # GDXs for comparison. + gdxList <- c("fulldata-SSP2-EU21-PkBudg650-release.gdx" = "https://rse.pik-potsdam.de/data/example/remind2_test-convGDX2MIF_SSP2-EU21-PkBudg650_2024-06-18_22.43.19.gdx", + "fulldata-SSP2-NPi-AMT.gdx" = "https://rse.pik-potsdam.de/data/example/remind2_test-convGDX2MIF_SSP2-NPi-AMT.gdx") gdxPaths <- NULL for (i in seq_along(gdxList)) { From 5cdb3242dd9283ab2f3bfbccd12c6bec51cb04eb Mon Sep 17 00:00:00 2001 From: orichters Date: Thu, 4 Jul 2024 17:11:14 +0200 Subject: [PATCH 4/4] update version --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 2bbc3dcf..99cce172 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '228122760' +ValidationKey: '228165588' 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 1bd806e8..eba3e473 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: 'remind2: The REMIND R package (2nd generation)' -version: 1.146.0 -date-released: '2024-07-02' +version: 1.146.1 +date-released: '2024-07-04' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index efbb8d21..d0b3860b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.146.0 -Date: 2024-07-02 +Version: 1.146.1 +Date: 2024-07-04 Authors@R: c( person("Renato", "Rodrigues", , "renato.rodrigues@pik-potsdam.de", role = c("aut", "cre")), person("Lavinia", "Baumstark", role = "aut"), diff --git a/README.md b/README.md index ea1c942a..9b758d7e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.146.0** +R package **remind2**, version **1.146.1** [![CRAN status](https://www.r-pkg.org/badges/version/remind2)](https://cran.r-project.org/package=remind2) [![R build status](https://github.com/pik-piam/remind2/workflows/check/badge.svg)](https://github.com/pik-piam/remind2/actions) [![codecov](https://codecov.io/gh/pik-piam/remind2/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/remind2) [![r-universe](https://pik-piam.r-universe.dev/badges/remind2)](https://pik-piam.r-universe.dev/builds) @@ -49,7 +49,7 @@ In case of questions / problems please contact Renato Rodrigues . +Rodrigues R, Baumstark L, Benke F, Dietrich J, Dirnaichner A, Duerrwaechter J, Führlich P, Giannousakis A, Hasse R, Hilaire J, Klein D, Koch J, Kowalczyk K, Levesque A, Malik A, Merfort A, Merfort L, Morena-Leiva S, Pehl M, Pietzcker R, Rauner S, Richters O, Rottoli M, Schötz C, Schreyer F, Siala K, Sörgel B, Spahr M, Strefler J, Verpoort P, Weigmann P, Rüter T (2024). _remind2: The REMIND R package (2nd generation)_. R package version 1.146.1, . A BibTeX entry for LaTeX users is @@ -58,7 +58,7 @@ A BibTeX entry for LaTeX users is title = {remind2: The REMIND R package (2nd generation)}, author = {Renato Rodrigues and Lavinia Baumstark and Falk Benke and Jan Philipp Dietrich and Alois Dirnaichner and Jakob Duerrwaechter and Pascal Führlich and Anastasis Giannousakis and Robin Hasse and Jérome Hilaire and David Klein and Johannes Koch and Katarzyna Kowalczyk and Antoine Levesque and Aman Malik and Anne Merfort and Leon Merfort and Simón Morena-Leiva and Michaja Pehl and Robert Pietzcker and Sebastian Rauner and Oliver Richters and Marianna Rottoli and Christof Schötz and Felix Schreyer and Kais Siala and Björn Sörgel and Mike Spahr and Jessica Strefler and Philipp Verpoort and Pascal Weigmann and Tonn Rüter}, year = {2024}, - note = {R package version 1.146.0}, + note = {R package version 1.146.1}, url = {https://github.com/pik-piam/remind2}, } ```