From 6deddf3e5bf2f0e4eb8d0c6a2961ce7ad25530be Mon Sep 17 00:00:00 2001 From: Chen Gong <> Date: Sun, 11 Feb 2024 21:06:10 +0100 Subject: [PATCH] fix bug: wrong name for plot variable (not consistent with mip) --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- inst/markdown/compareScenarios2/cs2_02_macro.Rmd | 4 ++-- inst/markdown/compareScenarios2/cs2_10_tech_cost.Rmd | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 435d79e7..73aed147 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '224160366' +ValidationKey: '224202816' 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 c83a3fcc..cd9c9a45 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.134.3 -date-released: '2024-02-09' +version: 1.134.4 +date-released: '2024-02-11' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index 85c34af9..0f05abd3 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.134.3 -Date: 2024-02-09 +Version: 1.134.4 +Date: 2024-02-11 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 80e0a67a..e362e703 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.134.3** +R package **remind2**, version **1.134.4** [![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 (2024). _remind2: The REMIND R package (2nd generation)_. R package version 1.134.4, . 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}, year = {2024}, - note = {R package version 1.134.3}, + note = {R package version 1.134.4}, url = {https://github.com/pik-piam/remind2}, } ``` diff --git a/inst/markdown/compareScenarios2/cs2_02_macro.Rmd b/inst/markdown/compareScenarios2/cs2_02_macro.Rmd index 7228550b..bf561f98 100644 --- a/inst/markdown/compareScenarios2/cs2_02_macro.Rmd +++ b/inst/markdown/compareScenarios2/cs2_02_macro.Rmd @@ -288,7 +288,7 @@ kayaRel <- ### Absolute ```{r Kaya Decomposition Absolute} -showMultiLinePlots(kaya, kayaVars, NROW_NUM = 2) +showMultiLinePlots(kaya, kayaVars, nrowNum = 2) walk(kayaVars, showRegiLinePlots, data = kaya) ``` @@ -297,7 +297,7 @@ cat("### Relative to ", refYear, "\n") ``` ```{r Kaya Decomposition Relative} -showMultiLinePlots(kayaRel, kayaVars, NROW_NUM = 2) +showMultiLinePlots(kayaRel, kayaVars, nrowNum = 2) walk(kayaVars, showRegiLinePlots, data = kayaRel) ``` diff --git a/inst/markdown/compareScenarios2/cs2_10_tech_cost.Rmd b/inst/markdown/compareScenarios2/cs2_10_tech_cost.Rmd index 194179de..fe40ac8b 100644 --- a/inst/markdown/compareScenarios2/cs2_10_tech_cost.Rmd +++ b/inst/markdown/compareScenarios2/cs2_10_tech_cost.Rmd @@ -58,7 +58,7 @@ items1 <- c( "Tech|DAC|Capital Costs|w/ Adj Costs", NULL) -showMultiLinePlots(data, items1, NROW_NUM = 3) +showMultiLinePlots(data, items1, nrowNum = 3) items2 <- c( "Tech|Electricity|Gas|Combined Cycle w/ CC|Capital Costs", @@ -69,6 +69,6 @@ items2 <- c( "Tech|Electricity|Coal|Combined Heat and Power w/o CC|Capital Costs", "Tech|Heat|Coal|Capital Costs", NULL) -showMultiLinePlots(data, items2, NROW_NUM = 3) +showMultiLinePlots(data, items2, nrowNum = 3) ```