From a224bc941990ee3daf68cea862c3bec37627fb39 Mon Sep 17 00:00:00 2001 From: David Klein Date: Mon, 15 Jan 2024 14:56:45 +0100 Subject: [PATCH 1/3] Don't let read.report complain about replacing "." with "p" when reading REMIND reports. --- R/readREMIND.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/readREMIND.R b/R/readREMIND.R index be0cb6fc..28fdb0d0 100644 --- a/R/readREMIND.R +++ b/R/readREMIND.R @@ -19,7 +19,7 @@ readREMIND <- function(subtype) { x <- NULL for (f in fileList) { # select REMIND only since newer coupled REMIND reportings also contain MAgPIE - x <- mbind(x, read.report(f, as.list = FALSE)[, , "REMIND"]) + x <- mbind(x, read.report(f, as.list = FALSE, showSeparatorWarning = FALSE)[, , "REMIND"]) } # remove model and variable name x <- collapseNames(x) From bb319111e8ab447cdb0557298443cfea1b8cf699 Mon Sep 17 00:00:00 2001 From: David Klein Date: Tue, 16 Jan 2024 13:47:20 +0100 Subject: [PATCH 2/3] buildLibrary() --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 6 +++--- README.md | 8 ++++---- man/mrland-package.Rd | 9 +++++++++ 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 7d832f2a..7ea0e5b0 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '10359300' +ValidationKey: '10382188' 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 77fa2f35..aa7ca4ac 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: 'mrland: MadRaT land data package' -version: 0.52.5 -date-released: '2024-01-10' +version: 0.52.6 +date-released: '2024-01-16' abstract: The package provides land related data via the madrat framework. authors: - family-names: Dietrich diff --git a/DESCRIPTION b/DESCRIPTION index 7aae1623..e9ff8ac5 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrland Title: MadRaT land data package -Version: 0.52.5 -Date: 2024-01-10 +Version: 0.52.6 +Date: 2024-01-16 Authors@R: c( person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = c("aut", "cre")), person("Abhijeet", "Mishra", role = "aut"), @@ -58,4 +58,4 @@ VignetteBuilder: knitr Encoding: UTF-8 LazyData: no -RoxygenNote: 7.2.3 +RoxygenNote: 7.3.0 diff --git a/README.md b/README.md index 32e9e57f..7cd7f9bc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRaT land data package -R package **mrland**, version **0.52.5** +R package **mrland**, version **0.52.6** [![CRAN status](https://www.r-pkg.org/badges/version/mrland)](https://cran.r-project.org/package=mrland) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3822083.svg)](https://doi.org/10.5281/zenodo.3822083) [![R build status](https://github.com/pik-piam/mrland/workflows/check/badge.svg)](https://github.com/pik-piam/mrland/actions) [![codecov](https://codecov.io/gh/pik-piam/mrland/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrland) [![r-universe](https://pik-piam.r-universe.dev/badges/mrland)](https://pik-piam.r-universe.dev/builds) @@ -39,7 +39,7 @@ In case of questions / problems please contact Jan Philipp Dietrich , R package version 0.52.5, . +Dietrich J, Mishra A, Weindl I, Bodirsky B, Wang X, Baumstark L, Kreidenweis U, Klein D, Steinmetz N, Chen D, Humpenoeder F, von Jeetze P, Wirth S, Beier F, Hoetten D (2024). _mrland: MadRaT land data package_. doi:10.5281/zenodo.3822083 , R package version 0.52.6, . A BibTeX entry for LaTeX users is @@ -48,8 +48,8 @@ A BibTeX entry for LaTeX users is title = {mrland: MadRaT land data package}, author = {Jan Philipp Dietrich and Abhijeet Mishra and Isabelle Weindl and Benjamin Leon Bodirsky and Xiaoxi Wang and Lavinia Baumstark and Ulrich Kreidenweis and David Klein and Nele Steinmetz and David Chen and Florian Humpenoeder and Patrick {von Jeetze} and Stephen Wirth and Felicitas Beier and David Hoetten}, year = {2024}, - note = {R package version 0.52.5}, - doi = {10.5281/zenodo.3822083}, + note = {R package version 0.52.6}, url = {https://github.com/pik-piam/mrland}, + doi = {10.5281/zenodo.3822083}, } ``` diff --git a/man/mrland-package.Rd b/man/mrland-package.Rd index 203d505f..954ce122 100644 --- a/man/mrland-package.Rd +++ b/man/mrland-package.Rd @@ -7,6 +7,15 @@ \title{MadRaT land data package} \description{ The package provides land related data via the madrat framework. +} +\seealso{ +Useful links: +\itemize{ + \item \url{https://github.com/pik-piam/mrland} + \item \doi{10.5281/zenodo.3822083} + \item Report bugs at \url{https://github.com/pik-piam/mrland/issues} +} + } \author{ Maintainer: Jan Philipp Dietrich From 8da6f093515888aaf718a374600db776523169ae Mon Sep 17 00:00:00 2001 From: David Klein Date: Wed, 17 Jan 2024 09:50:16 +0100 Subject: [PATCH 3/3] Require magclass at least 6.13.1 to have showSeparatorWarning available --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index e9ff8ac5..7b427fd0 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -29,7 +29,7 @@ BugReports: https://github.com/pik-piam/mrland/issues Depends: R (>= 2.10.0), madrat (>= 1.30), - magclass (>= 3.17), + magclass (>= 6.13.1), mrdrivers (>= 1.0.0), mrcommons (>= 1.37.0), mrfactors