From 83a2ec68c978e06045e110e343046eca1bebc52b Mon Sep 17 00:00:00 2001 From: Falk Benke Date: Fri, 26 Jan 2024 15:31:12 +0100 Subject: [PATCH] remove years argument from fullVALIDATIONREMIND to not break REMIND --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- R/fullVALIDATIONREMIND.R | 7 ++++--- README.md | 6 +++--- man/fullVALIDATIONREMIND.Rd | 5 +---- 6 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 4a22a9c1..d8ea18b1 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '34555500' +ValidationKey: '34578748' 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 687213ab..94d157b3 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: 'mrremind: MadRat REMIND Input Data Package' -version: 0.175.0 -date-released: '2024-01-24' +version: 0.175.1 +date-released: '2024-01-26' abstract: The mrremind packages contains data preprocessing for the REMIND model. authors: - family-names: Baumstark diff --git a/DESCRIPTION b/DESCRIPTION index 9e2e5312..f7c7c0b5 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrremind Title: MadRat REMIND Input Data Package -Version: 0.175.0 -Date: 2024-01-24 +Version: 0.175.1 +Date: 2024-01-26 Authors@R: c( person("Lavinia", "Baumstark", , "lavinia@pik-potsdam.de", role = c("aut", "cre")), person("Renato", "Rodrigues", role = "aut"), diff --git a/R/fullVALIDATIONREMIND.R b/R/fullVALIDATIONREMIND.R index e1011900..78214bd9 100644 --- a/R/fullVALIDATIONREMIND.R +++ b/R/fullVALIDATIONREMIND.R @@ -5,8 +5,6 @@ #' #' @md #' @param rev Unused parameter here for the pleasure of [`madrat`]. -#' @param years A vector of years that should be returned. If set to `NULL` all -#' available years are returned. #' @author David Klein, Falk Benke #' @seealso [`fullREMIND()`], [`readSource()`], [`getCalculations()`], #' [`calcOutput()`] @@ -15,7 +13,10 @@ #' fullVALIDATIONREMIND() #' } -fullVALIDATIONREMIND <- function(rev = 0, years = NULL) { +fullVALIDATIONREMIND <- function(rev = 0) { + + years = NULL + # get region mappings for aggregation ---- # Determines all regions data should be aggregated to by examining the columns # of the `regionmapping` and `extramappings` currently configured. diff --git a/README.md b/README.md index b251986d..651430d7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRat REMIND Input Data Package -R package **mrremind**, version **0.175.0** +R package **mrremind**, version **0.175.1** [![CRAN status](https://www.r-pkg.org/badges/version/mrremind)](https://cran.r-project.org/package=mrremind) [![R build status](https://github.com/pik-piam/mrremind/workflows/check/badge.svg)](https://github.com/pik-piam/mrremind/actions) [![codecov](https://codecov.io/gh/pik-piam/mrremind/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrremind) [![r-universe](https://pik-piam.r-universe.dev/badges/mrremind)](https://pik-piam.r-universe.dev/builds) @@ -39,7 +39,7 @@ In case of questions / problems please contact Lavinia Baumstark . +Baumstark L, Rodrigues R, Levesque A, Oeser J, Bertram C, Mouratiadou I, Malik A, Schreyer F, Soergel B, Rottoli M, Mishra A, Dirnaichner A, Pehl M, Giannousakis A, Klein D, Strefler J, Feldhaus L, Brecha R, Rauner S, Dietrich J, Bi S, Benke F, Weigmann P, Richters O, Hasse R, Fuchs S, Mandaroux R (2024). _mrremind: MadRat REMIND Input Data Package_. R package version 0.175.1, . A BibTeX entry for LaTeX users is @@ -48,7 +48,7 @@ A BibTeX entry for LaTeX users is title = {mrremind: MadRat REMIND Input Data Package}, author = {Lavinia Baumstark and Renato Rodrigues and Antoine Levesque and Julian Oeser and Christoph Bertram and Ioanna Mouratiadou and Aman Malik and Felix Schreyer and Bjoern Soergel and Marianna Rottoli and Abhijeet Mishra and Alois Dirnaichner and Michaja Pehl and Anastasis Giannousakis and David Klein and Jessica Strefler and Lukas Feldhaus and Regina Brecha and Sebastian Rauner and Jan Philipp Dietrich and Stephen Bi and Falk Benke and Pascal Weigmann and Oliver Richters and Robin Hasse and Sophie Fuchs and Rahel Mandaroux}, year = {2024}, - note = {R package version 0.175.0}, + note = {R package version 0.175.1}, url = {https://github.com/pik-piam/mrremind}, } ``` diff --git a/man/fullVALIDATIONREMIND.Rd b/man/fullVALIDATIONREMIND.Rd index 9e540e35..b7685612 100644 --- a/man/fullVALIDATIONREMIND.Rd +++ b/man/fullVALIDATIONREMIND.Rd @@ -4,13 +4,10 @@ \alias{fullVALIDATIONREMIND} \title{Generate Validation Data for REMIND} \usage{ -fullVALIDATIONREMIND(rev = 0, years = NULL) +fullVALIDATIONREMIND(rev = 0) } \arguments{ \item{rev}{Unused parameter here for the pleasure of \code{\link{madrat}}.} - -\item{years}{A vector of years that should be returned. If set to \code{NULL} all -available years are returned.} } \description{ Function that generates the historical regional dataset against which the